From 0393eba096e3316398b3e818663909ef3e9b38db Mon Sep 17 00:00:00 2001 From: Scott Kennedy Date: Wed, 26 Mar 2014 13:49:25 -0700 Subject: [PATCH] Point to new chips location Change-Id: I4d4934ffc4dedcb951d878dd10246c3fd40a1d0b --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 8bbbd98a4..35ec14ee8 100644 --- a/Android.mk +++ b/Android.mk @@ -20,7 +20,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) # Include res dir from chips, unified, emailcommon, and photoviewer -chips_dir := ../../../frameworks/ex/chips/res +chips_dir := ../../../frameworks/opt/chips/res unified_email_dir := ../UnifiedEmail photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res emailcommon_dir := emailcommon @@ -42,7 +42,7 @@ LOCAL_ASSET_DIR := $(LOCAL_PATH)/$(unified_email_dir)/assets LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.emailcommon:com.android.ex.photo:android.support.v7.gridlayout -LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon com.android.emailsync guava android-common-chips libphotoviewer +LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon com.android.emailsync guava libchips libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13