commit f8d124d8b6d1ad9e90161b8b90d0e2631eaf019c
author Kirill Grouchnikov <kirillg@google.com> Tue May 09 08:39:57 2017 -0700
committer Kirill Grouchnikov <kirillg@google.com> Thu May 11 08:43:28 2017 -0700
tree b59c67924fdffb599150bb3608f604687c8658ad
parent 41036b115642254cce94bfc8cd92d008ed10a440

Tweak app makefile with extra resources

Test: mmma packages/apps/Contacts
Bug: 30240339
Change-Id: I021f36288641732309013a20b3b70d0d2d6d4700

Android.mk

diff --git a/Android.mk b/Android.mk
index 57d521e..c73c256 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,29 +5,25 @@
 
 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_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
+    $(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
 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 \