diff options
author | Aurimas Liutikas <aurimas@google.com> | 2017-11-21 12:09:17 -0800 |
---|---|---|
committer | Aurimas Liutikas <aurimas@google.com> | 2017-11-21 12:09:17 -0800 |
commit | 3959d1a32179a67fbea303d99edfc17803aafc0f (patch) | |
tree | e548acb868488079cf8d83cda7aaa2f2e84cc334 | |
parent | a0d4e3108663202564a6833b76770075b8e5b767 (diff) | |
download | bitmap-pie-b4s4-release.tar.gz |
Migrate android-opt-bitmap to aapt2.android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
Test: make android-opt-bitmap
Change-Id: Ic6071a55e7717e774072a8db2367b2aeed69d21c
-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 |