summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-05-19 23:52:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-19 23:52:06 +0000
commit00c11e0af7ecb18bc1b007b2c1a7dc36bbd0a5db (patch)
tree425acb1618f7e6e9d0067e8ed4255ac5bedf7318
parent37269cd3418c2bf99424966146203ccef6d8d70f (diff)
parent083af06aba7d1d5d3a581f1b404d2df5978e07d3 (diff)
downloadandroid_packages_apps_Email-00c11e0af7ecb18bc1b007b2c1a7dc36bbd0a5db.tar.gz
android_packages_apps_Email-00c11e0af7ecb18bc1b007b2c1a7dc36bbd0a5db.tar.bz2
android_packages_apps_Email-00c11e0af7ecb18bc1b007b2c1a7dc36bbd0a5db.zip
am 083af06a: Use to reference support library resource dir.
* commit '083af06aba7d1d5d3a581f1b404d2df5978e07d3': Use $(SUPPORT_LIBRARY_ROOT) to reference support library resource dir.
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index cfdf52dda..b6a4bd90d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,12 +20,12 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
# Include res dir from chips, unified, emailcommon, and photoviewer
-appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat/res
+appcompat_dir := ../../../$(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res
chips_dir := ../../../frameworks/opt/chips/res
unified_email_dir := ../UnifiedEmail
photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/appcompat/res
emailcommon_dir := emailcommon
-gridlayout_dir := ../../../prebuilts/sdk/current/support/v7/gridlayout/res
+gridlayout_dir := ../../../$(SUPPORT_LIBRARY_ROOT)/v7/gridlayout/res
bitmap_dir := ../../../frameworks/opt/bitmap/res
datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res
res_dir := res $(unified_email_dir)/res $(chips_dir) $(photo_dir) $(emailcommon_dir)/res $(appcompat_dir) $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir)