commit 4f8bc2d99bd99e6129dd4bb90e541acc98451586
author Alan Viverette <alanv@google.com> Wed Apr 26 16:09:04 2017 -0400
committer Alan Viverette <alanv@google.com> Wed Apr 26 16:09:04 2017 -0400
tree 798497aef1cacec3c47254b002eaf9f1adf31a68
parent 1bed4cce0d99f8339cbc4538780730529cc62b78

Use AAPT2

Test: make checkbuild
Change-Id: Iba9f7917d9ef9844efb90392b26af0e1600defba

Android.mk

diff --git a/Android.mk b/Android.mk
index 5159b84..275213d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,14 +15,9 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-ifeq ($(TARGET_BUILD_APPS),)
-support_library_root_dir := frameworks/support
-else
-support_library_root_dir := prebuilts/sdk/current/support
-endif
-
 LOCAL_MODULE_TAGS := eng
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v14-preference \
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+    android-support-v14-preference \
     android-support-v13 \
     android-support-v7-appcompat \
     android-support-v7-preference \
@@ -32,22 +27,9 @@
     android-support-transition
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res \
-    $(support_library_root_dir)/v7/appcompat/res \
-    $(support_library_root_dir)/v7/preference/res \
-    $(support_library_root_dir)/v7/recyclerview/res \
-    $(support_library_root_dir)/v14/preference/res \
-    $(support_library_root_dir)/v14/preference/res \
-    $(support_library_root_dir)/design/res \
-    $(support_library_root_dir)/transition/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
 
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages android.support.v7.preference \
-	--extra-packages android.support.v14.preference \
-	--extra-packages android.support.v7.appcompat \
-	--extra-packages android.support.v7.recyclerview \
-	--extra-packages android.support.design \
-	--extra-packages android.support.transition
+LOCAL_USE_AAPT2 := true
 
 LOCAL_PACKAGE_NAME := EmergencyInfo
 LOCAL_CERTIFICATE := platform