From d9b6b48425f4c64f9569551814ae2888c8acce05 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 16 Aug 2018 21:47:56 -0700 Subject: Convert frameworks/opt/photoviewer to Android.bp See build/soong/README.md for more information. Test: m checkbuild Change-Id: I1c6e52ee66f7f391516cf676c8aa5cca8db2b856 --- Android.bp | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ Android.mk | 77 ------------------------------------------------------- sample/Android.bp | 65 ++++++++++++++++++++++++++++++++++++++++++++++ sample/Android.mk | 74 ---------------------------------------------------- 4 files changed, 135 insertions(+), 151 deletions(-) create mode 100644 Android.bp delete mode 100644 Android.mk create mode 100644 sample/Android.bp delete mode 100644 sample/Android.mk diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..1c7858f --- /dev/null +++ b/Android.bp @@ -0,0 +1,70 @@ +// Copyright (C) 2012 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//################################################# +// Build appcompat library + +android_library { + name: "libphotoviewer_appcompat", + + libs: ["androidx.annotation_annotation"], + + static_libs: [ + "androidx.core_core", + "androidx.legacy_legacy-support-core-ui", + "androidx.legacy_legacy-support-core-utils", + "androidx.fragment_fragment", + "androidx.appcompat_appcompat", + ], + + sdk_version: "current", + srcs: [ + "src/**/*.java", + "appcompat/src/**/*.java", + "src/**/*.logtags", + ], + + resource_dirs: [ + "appcompat/res", + "res", + ], +} + +//################################################# +// Build non-appcompat library + +android_library { + name: "libphotoviewer", + + libs: ["androidx.annotation_annotation"], + + static_libs: [ + "androidx.core_core", + "androidx.legacy_legacy-support-core-ui", + "androidx.legacy_legacy-support-core-utils", + "androidx.fragment_fragment", + ], + + sdk_version: "current", + srcs: [ + "src/**/*.java", + "activity/src/**/*.java", + "src/**/*.logtags", + ], + + resource_dirs: [ + "activity/res", + "res", + ] +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index e950a5c..0000000 --- a/Android.mk +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright (C) 2012 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -################################################## -# Build appcompat library -include $(CLEAR_VARS) - -appcompat_res_dirs := appcompat/res res -LOCAL_MODULE := libphotoviewer_appcompat - -LOCAL_JAVA_LIBRARIES := \ - androidx.annotation_annotation - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - androidx.core_core \ - androidx.legacy_legacy-support-core-ui \ - androidx.legacy_legacy-support-core-utils \ - androidx.fragment_fragment \ - androidx.appcompat_appcompat - -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-java-files-under, appcompat/src) \ - $(call all-logtags-files-under, src) - -LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(appcompat_res_dirs)) -LOCAL_USE_AAPT2 := true - -include $(BUILD_STATIC_JAVA_LIBRARY) - -################################################## -# Build non-appcompat library -include $(CLEAR_VARS) - -activity_res_dirs := activity/res res -LOCAL_MODULE := libphotoviewer - -LOCAL_JAVA_LIBRARIES := \ - androidx.annotation_annotation - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - androidx.core_core \ - androidx.legacy_legacy-support-core-ui \ - androidx.legacy_legacy-support-core-utils \ - androidx.fragment_fragment - -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-java-files-under, activity/src) \ - $(call all-logtags-files-under, src) - -LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(activity_res_dirs)) -LOCAL_USE_AAPT2 := true - -include $(BUILD_STATIC_JAVA_LIBRARY) - - - -################################################## -# Build all sub-directories - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/sample/Android.bp b/sample/Android.bp new file mode 100644 index 0000000..389032e --- /dev/null +++ b/sample/Android.bp @@ -0,0 +1,65 @@ +// Copyright 2011, The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//################################################# +// Build APK + +android_app { + name: "PhotoViewerSample", + + libs: ["androidx.annotation_annotation"], + + static_libs: [ + "androidx.core_core", + "androidx.legacy_legacy-support-core-ui", + "androidx.legacy_legacy-support-core-utils", + "androidx.fragment_fragment", + "libphotoviewer", + ], + + sdk_version: "current", + + srcs: [ + "src/**/*.java", + "src/**/*.logtags", + ], + resource_dirs: ["res"], +} + +//################################################# +// Build APK +android_app { + name: "AppcompatPhotoViewerSample", + + libs: ["androidx.annotation_annotation"], + + static_libs: [ + "androidx.core_core", + "androidx.legacy_legacy-support-core-ui", + "androidx.legacy_legacy-support-core-utils", + "androidx.fragment_fragment", + "androidx.media_media", + "androidx.appcompat_appcompat", + "libphotoviewer_appcompat", + ], + + sdk_version: "current", + + srcs: [ + "src/**/*.java", + "src/**/*.logtags", + ], + resource_dirs: ["res"], + +} diff --git a/sample/Android.mk b/sample/Android.mk deleted file mode 100644 index 0c35d79..0000000 --- a/sample/Android.mk +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2011, The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) - -################################################## -# Build APK -include $(CLEAR_VARS) - -src_dirs := src -LOCAL_PACKAGE_NAME := PhotoViewerSample - -LOCAL_JAVA_LIBRARIES := \ - androidx.annotation_annotation - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - androidx.core_core \ - androidx.legacy_legacy-support-core-ui \ - androidx.legacy_legacy-support-core-utils \ - androidx.fragment_fragment \ - libphotoviewer - -LOCAL_SDK_VERSION := current - -LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) \ - $(call all-logtags-files-under, $(src_dirs)) -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_USE_AAPT2 := true - -include $(BUILD_PACKAGE) - -################################################## -# Build APK -include $(CLEAR_VARS) - -src_dirs := src -LOCAL_PACKAGE_NAME := AppcompatPhotoViewerSample - -LOCAL_JAVA_LIBRARIES := \ - androidx.annotation_annotation - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - androidx.core_core \ - androidx.legacy_legacy-support-core-ui \ - androidx.legacy_legacy-support-core-utils \ - androidx.fragment_fragment \ - androidx.media_media \ - androidx.appcompat_appcompat \ - libphotoviewer_appcompat - -LOCAL_SDK_VERSION := current - -LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) \ - $(call all-logtags-files-under, $(src_dirs)) -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_USE_AAPT2 := true - -include $(BUILD_PACKAGE) - -################################################## -# Build all sub-directories - -include $(call all-makefiles-under,$(LOCAL_PATH)) -- cgit v1.2.3