Revert "Tweak app makefile with extra resources"
This reverts commit 9cca1b2a1f2e380055dfd0c8bf0e575ddefcd2f7.
Bug: 30240339
Change-Id: I13cfc28d97f4eb27ea432c57f8b3b9075c3b8edd
diff --git a/Android.mk b/Android.mk
index 769d966..ab07ab1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,8 +22,7 @@
LOCAL_AIDL_INCLUDES := $(call all-Iaidl-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_RESOURCE_DIR += $(SUPPORT_LIBRARY_ROOT)/core-ui/res
-LOCAL_RESOURCE_DIR += $(SUPPORT_LIBRARY_ROOT)/design/res
+LOCAL_RESOURCE_DIR += frameworks/support/design/res
LOCAL_PACKAGE_NAME := CarRadioApp
@@ -40,13 +39,12 @@
LOCAL_STATIC_JAVA_LIBRARIES += car-stream-lib
LOCAL_STATIC_JAVA_LIBRARIES += car-radio-service
-LOCAL_AAPT_FLAGS += --extra-packages android.support.coreui
LOCAL_AAPT_FLAGS += --extra-packages android.support.design
LOCAL_AAPT_FLAGS += --extra-packages com.android.car.radio.service
# Include support-v7-appcompat, if not already included
ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += $(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res
+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
endif
