diff options
author | Colin Cross <ccross@android.com> | 2018-08-21 13:37:09 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-21 13:37:09 -0700 |
commit | bbe147b80d944c6e701450c463cb23569ae2561a (patch) | |
tree | 3851357fa96b56e47a5e45d4f6a2df612b043972 | |
parent | 94ac7bf24a3d9e92f3bfbd171e7198372fd09832 (diff) | |
parent | 5786370b1162a765a5505cbaf83aa300a9e9395b (diff) | |
download | photoviewer-bbe147b80d944c6e701450c463cb23569ae2561a.tar.gz |
Merge "Convert frameworks/opt/photoviewer to Android.bp" am: 30dc726a7d
am: 5786370b11
Change-Id: Ic64007c4728c548ef826f10521fb9b8dfcd3a5f1
-rw-r--r-- | Android.bp | 70 | ||||
-rw-r--r-- | Android.mk | 77 | ||||
-rw-r--r-- | sample/Android.bp | 65 | ||||
-rw-r--r-- | sample/Android.mk | 74 |
4 files changed, 135 insertions, 151 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..195df8a --- /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: ["android-support-annotations"], + + static_libs: [ + "android-support-compat", + "android-support-core-ui", + "android-support-core-utils", + "android-support-fragment", + "android-support-v7-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: ["android-support-annotations"], + + static_libs: [ + "android-support-compat", + "android-support-core-ui", + "android-support-core-utils", + "android-support-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 7d08da7..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 := \ - android-support-annotations - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-compat \ - android-support-core-ui \ - android-support-core-utils \ - android-support-fragment \ - android-support-v7-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 := \ - android-support-annotations - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-compat \ - android-support-core-ui \ - android-support-core-utils \ - android-support-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..757fa00 --- /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: ["android-support-annotations"], + + static_libs: [ + "android-support-compat", + "android-support-core-ui", + "android-support-core-utils", + "android-support-fragment", + "libphotoviewer", + ], + + sdk_version: "current", + + srcs: [ + "src/**/*.java", + "src/**/*.logtags", + ], + resource_dirs: ["res"], +} + +//################################################# +// Build APK +android_app { + name: "AppcompatPhotoViewerSample", + + libs: ["android-support-annotations"], + + static_libs: [ + "android-support-compat", + "android-support-core-ui", + "android-support-core-utils", + "android-support-fragment", + "android-support-media-compat", + "android-support-v7-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 2ec43e8..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 := \ - android-support-annotations - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-compat \ - android-support-core-ui \ - android-support-core-utils \ - android-support-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 := \ - android-support-annotations - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-compat \ - android-support-core-ui \ - android-support-core-utils \ - android-support-fragment \ - android-support-media-compat \ - android-support-v7-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)) |