diff options
author | Colin Cross <ccross@android.com> | 2018-08-17 17:58:55 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-17 17:58:55 -0700 |
commit | 540ef0e66ffbd8f099641f2af22eb2d8a90fa312 (patch) | |
tree | 0c27aadd054aa068f4d015b50387da5c4e220760 | |
parent | 05835ac05b95f614d43c9289dc070e13b7fbe4ca (diff) | |
parent | 6611d20648871d1bd2f782494fb60fd0e94bd5cb (diff) | |
download | bitmap-540ef0e66ffbd8f099641f2af22eb2d8a90fa312.tar.gz |
Convert frameworks/opt/bitmap to Android.bp am: f35e4af6c8
am: 6611d20648
Change-Id: I865390054b36c59bf4be6d6a202be9d718274c9e
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | Android.mk | 36 | ||||
-rw-r--r-- | sample/Android.bp | 29 | ||||
-rw-r--r-- | sample/Android.mk | 39 |
4 files changed, 52 insertions, 75 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..5822199 --- /dev/null +++ b/Android.bp @@ -0,0 +1,23 @@ +// Copyright (C) 2013 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. + +android_library { + name: "android-opt-bitmap", + sdk_version: "18", + srcs: [ + "src/**/*.java", + "src/**/*.logtags", + ], + resource_dirs: ["res"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 1eb9c75..0000000 --- a/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2013 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) -include $(CLEAR_VARS) - -LOCAL_MODULE := android-opt-bitmap - -LOCAL_SDK_VERSION := 18 - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-logtags-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -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..89ce889 --- /dev/null +++ b/sample/Android.bp @@ -0,0 +1,29 @@ +// Copyright (C) 2013 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. + +android_app { + name: "bitmapcache-sample", + static_libs: ["android-opt-bitmap"], + sdk_version: "18", + srcs: [ + "src/**/*.java", + "src/**/*.logtags", + ], + resource_dirs: ["res"], + + optimize: { + proguard_flags_files: ["proguard-config.pro"], + }, + +} diff --git a/sample/Android.mk b/sample/Android.mk deleted file mode 100644 index 0d58ffd..0000000 --- a/sample/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2013 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) -include $(CLEAR_VARS) - -LOCAL_PACKAGE_NAME := bitmapcache-sample - -LOCAL_STATIC_ANDROID_LIBRARIES += android-opt-bitmap - -LOCAL_SDK_VERSION := 18 - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-logtags-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_USE_AAPT2 := true - -LOCAL_PROGUARD_FLAG_FILES := proguard-config.pro - -include $(BUILD_PACKAGE) - -################################################## -# Build all sub-directories - -include $(call all-makefiles-under,$(LOCAL_PATH)) |