From 083af06aba7d1d5d3a581f1b404d2df5978e07d3 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 19 May 2015 16:10:17 -0700 Subject: [PATCH] Use $(SUPPORT_LIBRARY_ROOT) to reference support library resource dir. The build system sets up $(SUPPORT_LIBRARY_ROOT) based on if it's platform build or apps-only build. Change-Id: I81e832138918c729e999690b4c3a215a3c989cfa --- Android.mk | 4 ++-- 1 file 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)