Migrate android-opt-bitmap to aapt2.
Test: make android-opt-bitmap
Change-Id: Ic6071a55e7717e774072a8db2367b2aeed69d21c
diff --git a/Android.mk b/Android.mk
index 825c9e0..1eb9c75 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,6 +25,8 @@
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 @@
$(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
