commit ea3b5e32100d2f1c9f75390ad79b4083d1ff7819
author Kirill Grouchnikov <kirillg@google.com> Mon May 07 12:30:08 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 07 12:30:08 2018 -0700
tree db6ba7f24a92832ee3390560f2ae5cdfb214cd9b
parent d21ebd74fb229aa347540c0bc1296fb2b8d75949
parent 823c1cf0fd884a65b27f7866fe38127e37b5eb76

Migrate Contacts app to aapt2
am: 823c1cf0fd

Change-Id: Ic8b14752ec37b18929c2ab311cf4832dde3fa93d

Android.mk

diff --git a/Android.mk b/Android.mk
index 57d521e..82a5ba4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,37 +5,15 @@
 
 phone_common_dir := ../PhoneCommon
 
-ifeq ($(TARGET_BUILD_APPS),)
-support_library_root_dir := frameworks/support
-else
-support_library_root_dir := prebuilts/sdk/current/support
-endif
-
 src_dirs := src src-bind $(phone_common_dir)/src
 res_dirs := res $(phone_common_dir)/res
 asset_dirs := assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
-    $(support_library_root_dir)/design/res \
-    $(support_library_root_dir)/transition/res \
-    $(support_library_root_dir)/v7/appcompat/res \
-    $(support_library_root_dir)/v7/cardview/res \
-    $(support_library_root_dir)/v7/recyclerview/res
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
 LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))
 
-LOCAL_AAPT_FLAGS := \
-    --auto-add-overlay \
-    --extra-packages com.android.contacts.common \
-    --extra-packages com.android.phone.common \
-    --extra-packages android.support.design \
-    --extra-packages android.support.transition \
-    --extra-packages android.support.v7.appcompat \
-    --extra-packages android.support.v7.cardview \
-    --extra-packages android.support.v7.recyclerview
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-common \
+LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-design \
     android-support-transition \
     android-support-v13 \
@@ -43,11 +21,20 @@
     android-support-v7-cardview \
     android-support-v7-recyclerview \
     android-support-v7-palette \
-    android-support-v4 \
+    android-support-v4
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-common \
     com.android.vcard \
     guava \
     libphonenumber
 
+LOCAL_USE_AAPT2 := true
+
+LOCAL_AAPT_FLAGS := \
+    --auto-add-overlay \
+    --extra-packages com.android.phone.common
+
 LOCAL_PACKAGE_NAME := Contacts
 LOCAL_CERTIFICATE := shared
 LOCAL_PRIVILEGED_MODULE := true