summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorScott Kennedy <skennedy@google.com>2014-03-21 14:25:04 -0700
committerScott Kennedy <skennedy@google.com>2014-03-21 14:25:04 -0700
commit3ba5b50caa9d225f28c6f6ae958ade16eedeebec (patch)
tree045bef91cc1de3bee410f24b3e7dc2bc7eafd50f /Android.mk
parent27d8eab266156c53fcc8f1d14831f1b3ab1c430f (diff)
downloadandroid_packages_apps_UnifiedEmail-3ba5b50caa9d225f28c6f6ae958ade16eedeebec.tar.gz
android_packages_apps_UnifiedEmail-3ba5b50caa9d225f28c6f6ae958ade16eedeebec.tar.bz2
android_packages_apps_UnifiedEmail-3ba5b50caa9d225f28c6f6ae958ade16eedeebec.zip
Switch to use chips in the new location
Change-Id: I325bb251ac9bc17381a7d4714dd3e43a0bbff6b4
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 96e2d221c..3e60c64b8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@
LOCAL_PATH:= $(call my-dir)
# Include res dir from chips
-chips_dir := ../../../frameworks/ex/chips/res
+chips_dir := ../../../frameworks/opt/chips/res
#Include res dir from photoviewer
photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res
@@ -31,7 +31,7 @@ include $(CLEAR_VARS)
src_dirs := src unified_src
LOCAL_PACKAGE_NAME := UnifiedEmail
-LOCAL_STATIC_JAVA_LIBRARIES := android-common-chips
+LOCAL_STATIC_JAVA_LIBRARIES := libchips
LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer
LOCAL_STATIC_JAVA_LIBRARIES += guava
LOCAL_STATIC_JAVA_LIBRARIES += android-common