commit b927e499771e5514ae8de5fea9d2b4bb8f31b0d2
author Kirill Grouchnikov <kirillg@google.com> Tue May 16 02:06:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 02:06:33 2017 +0000
tree b8cb0f4bdd27f2feb9076c8e803d910d0e844790
parent 0cb8e17bdcb2229c0b3f057688733ddedefdd4f0
parent d509b2dfcbd4a51d28c496bd2f3fd8f40f42528d

Revert "Tweak app makefile with extra resources" am: f83660d1e1
am: d509b2dfcb

Change-Id: I1280ba95d0f4ba8407acecbfde967e9570b59d80

Android.mk

diff --git a/Android.mk b/Android.mk
index 8f4e4bc..9f1e265 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