Migrate packages/apps/Car to aapt2
Test: None
Change-Id: I1cdef7953989ab4c75f0d69cdb82d95e7207e1aa
Merged-In: I1cdef7953989ab4c75f0d69cdb82d95e7207e1aa
(cherry picked from commit 6faeb37a333a322cecfab62369857b3fd2e3cc5b)
diff --git a/Android.mk b/Android.mk
index f023d3e..e157d6b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,6 @@
LOCAL_AIDL_INCLUDES := $(call all-Iaidl-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_RESOURCE_DIR += frameworks/support/design/res
LOCAL_PACKAGE_NAME := CarRadioApp
LOCAL_PRIVATE_PLATFORM_APIS := true
@@ -35,19 +34,21 @@
LOCAL_PRIVILEGED_MODULE := true
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-design
-LOCAL_STATIC_JAVA_LIBRARIES += car-stream-lib
-LOCAL_STATIC_JAVA_LIBRARIES += car-radio-service
+LOCAL_USE_AAPT2 := true
-LOCAL_AAPT_FLAGS += --extra-packages android.support.design
-LOCAL_AAPT_FLAGS += --extra-packages com.android.car.radio.service
+LOCAL_STATIC_ANDROID_LIBRARIES += \
+ android-support-v4 \
+ android-support-design \
+ car-radio-service
+
+LOCAL_STATIC_JAVA_LIBRARIES += \
+ car-stream-lib
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
# 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
