commit 5f0cfcf4de7080567c84f29399a0712e2c9f0cc3
author Aurimas Liutikas <aurimas@google.com> Mon May 07 12:28:23 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 07 12:28:23 2018 -0700
tree fabe4265efab5165c89cfb4d405b924ad5541249
parent 979626b0e6b9dbd7fe4a655be1834463ca901e00
parent fe560313ebfd471d41cf332417dde55d3d0389d3

Migrate packages/apps/Car to aapt2
am: fe560313eb

Change-Id: Icb02adf7db2bb7520852456815cde424bc858df5

Android.mk

diff --git a/Android.mk b/Android.mk
index 55ea1f4..8658432 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,10 +59,8 @@
 LOCAL_USE_AAPT2 := true
 
 # 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
 
 LOCAL_PROGUARD_ENABLED := disabled