Revert "Tweak app makefile with extra resources"
This reverts commit 022e0872094c2852f2d657a76c6eb0c39431ae7b.
Bug: 30240339
Change-Id: I7b8579f4ca45240ac2bfca6576ec9b3392e7fd16
diff --git a/Android.mk b/Android.mk
index cc70ded..1827ed5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,8 +21,7 @@
LOCAL_SRC_FILES := $(call all-java-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 := CarLensPickerApp
@@ -38,7 +37,7 @@
# 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