diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2017-11-21 12:09:17 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-04-25 22:58:01 -0700 |
| commit | 4264a5bb94f564890d09791184cd830e3252ddca (patch) | |
| tree | e548acb868488079cf8d83cda7aaa2f2e84cc334 | |
| parent | a0d4e3108663202564a6833b76770075b8e5b767 (diff) | |
| download | bitmap-4264a5bb94f564890d09791184cd830e3252ddca.tar.gz | |
Migrate android-opt-bitmap to aapt2.android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1
Test: make android-opt-bitmap
Change-Id: Ic6071a55e7717e774072a8db2367b2aeed69d21c
Merged-In: Ic6071a55e7717e774072a8db2367b2aeed69d21c
(cherry picked from commit 3959d1a32179a67fbea303d99edfc17803aafc0f)
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | sample/Android.mk | 11 |
2 files changed, 6 insertions, 7 deletions
@@ -25,6 +25,8 @@ LOCAL_SRC_FILES := \ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res +LOCAL_USE_AAPT2 := true + include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/sample/Android.mk b/sample/Android.mk index 43c22e7..0d58ffd 100644 --- a/sample/Android.mk +++ b/sample/Android.mk @@ -15,12 +15,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -bitmap_dir := ..//res -res_dirs := $(bitmap_dir) res - LOCAL_PACKAGE_NAME := bitmapcache-sample -LOCAL_STATIC_JAVA_LIBRARIES += android-opt-bitmap +LOCAL_STATIC_ANDROID_LIBRARIES += android-opt-bitmap LOCAL_SDK_VERSION := 18 @@ -28,9 +25,9 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ $(call all-logtags-files-under, src) -LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) -LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_AAPT_FLAGS += --extra-packages com.android.bitmap +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_USE_AAPT2 := true LOCAL_PROGUARD_FLAG_FILES := proguard-config.pro |