commit d8a35f525791964b55ed90a7f83f5c800b6eba2f
author Colin Cross <ccross@android.com> Mon May 07 12:28:50 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 07 12:28:50 2018 -0700
tree 89c43685bac9b55fb5a308c0b20654dea6283c70
parent 6b43712a2a2f686fc97ac05274ea8880a9817e5b
parent b8f6e8591f760073ebda60c2a6173c8ed0f9d688

Migrate packages/apps/Car to aapt2
am: b8f6e8591f

Change-Id: I635da2acb841831ae07fb8176d22b464037be711

Android.mk

diff --git a/Android.mk b/Android.mk
index 5aa2c1b..af8fd6f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,8 +32,13 @@
 include packages/apps/Car/libs/car-apps-common/car-apps-common.mk
 include packages/apps/Car/libs/car-stream-ui-lib/car-stream-ui-lib.mk
 
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES += car-stream-lib
+LOCAL_USE_AAPT2 := true
+
+LOCAL_STATIC_ANDROID_LIBRARIES += \
+    android-support-v4
+
+LOCAL_STATIC_JAVA_LIBRARIES += \
+    car-stream-lib
 
 LOCAL_PROGUARD_ENABLED := disabled
 
@@ -45,24 +50,18 @@
 endif
 
 # Include support-v7-appcompat, if not already included
-ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
+ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-appcompat
 endif
 
 # Include support-v7-recyclerview, if not already included
-ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
+ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-recyclerview
 endif
 
 # Include support-v7-cardview, if not already included
-ifeq (,$(findstring android-support-v7-cardview,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/cardview/res
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.cardview
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-cardview
+ifeq (,$(findstring android-support-v7-cardview,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-cardview
 endif
 
 include $(BUILD_PACKAGE)