commit 647bec6bc04f63cf83ba4dc369d3fd5ff62694ef
author Kirill Grouchnikov <kirillg@google.com> Tue May 16 01:33:14 2017 +0000
committer Kirill Grouchnikov <kirillg@google.com> Tue May 16 01:33:14 2017 +0000
tree f089c3c2646077b52c832f06d38131abf48919b3
parent f8d124d8b6d1ad9e90161b8b90d0e2631eaf019c

Revert "Tweak app makefile with extra resources"

This reverts commit f8d124d8b6d1ad9e90161b8b90d0e2631eaf019c.

Bug: 30240339
Change-Id: Ibce9a8142b3d0df275a9f346dafe4f37303a8aa4

Android.mk

diff --git a/Android.mk b/Android.mk
index c73c256..57d521e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,25 +5,29 @@
 
 phone_common_dir := ../PhoneCommon
 
+ifeq ($(TARGET_BUILD_APPS),)
+support_library_root_dir := frameworks/support
+else
+support_library_root_dir := prebuilts/sdk/current/support
+endif
+
 src_dirs := src src-bind $(phone_common_dir)/src
 res_dirs := res $(phone_common_dir)/res
 asset_dirs := assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
-    $(SUPPORT_LIBRARY_ROOT)/core-ui/res \
-    $(SUPPORT_LIBRARY_ROOT)/design/res \
-    $(SUPPORT_LIBRARY_ROOT)/transition/res \
-    $(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res \
-    $(SUPPORT_LIBRARY_ROOT)/v7/cardview/res \
-    $(SUPPORT_LIBRARY_ROOT)/v7/recyclerview/res
+    $(support_library_root_dir)/design/res \
+    $(support_library_root_dir)/transition/res \
+    $(support_library_root_dir)/v7/appcompat/res \
+    $(support_library_root_dir)/v7/cardview/res \
+    $(support_library_root_dir)/v7/recyclerview/res
 LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))
 
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
     --extra-packages com.android.contacts.common \
     --extra-packages com.android.phone.common \
-    --extra-packages android.support.coreui \
     --extra-packages android.support.design \
     --extra-packages android.support.transition \
     --extra-packages android.support.v7.appcompat \