diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-22 08:29:08 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-22 08:29:08 +0000 |
commit | fb45f26be0033b7b5e4e07bd0abf5ae0c58fbbd3 (patch) | |
tree | e548acb868488079cf8d83cda7aaa2f2e84cc334 | |
parent | a0d4e3108663202564a6833b76770075b8e5b767 (diff) | |
parent | 3959d1a32179a67fbea303d99edfc17803aafc0f (diff) | |
download | bitmap-pie-release.tar.gz |
Snap for 4464948 from 3959d1a32179a67fbea303d99edfc17803aafc0f to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: I914c89d1b1f318d9a981feae96f1f7c3c4388e98
-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 |