summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorScott Kennedy <skennedy@google.com>2014-03-26 13:48:47 -0700
committerScott Kennedy <skennedy@google.com>2014-03-26 13:48:47 -0700
commit27339c9ae22b5a2446034eae6cea8e86d1c3f15d (patch)
treeb5e8135db81aef11cd075eb28aab805e0a5f1219 /Android.mk
parent5c7b7a9cae26bcf4cb9a4c0aba73e29f709c01eb (diff)
downloadandroid_packages_apps_Calendar-27339c9ae22b5a2446034eae6cea8e86d1c3f15d.tar.gz
android_packages_apps_Calendar-27339c9ae22b5a2446034eae6cea8e86d1c3f15d.tar.bz2
android_packages_apps_Calendar-27339c9ae22b5a2446034eae6cea8e86d1c3f15d.zip
Point to new chips location
Change-Id: I1a99641a713d4a8d093e2f8c8e7d8415b9555462
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 4a8b1584..c7623c31 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# Include res dir from chips
-chips_dir := ../../../frameworks/ex/chips/res
+chips_dir := ../../../frameworks/opt/chips/res
color_picker_dir := ../../../frameworks/opt/colorpicker/res
datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res
timezonepicker_dir := ../../../frameworks/opt/timezonepicker/res
@@ -18,13 +18,13 @@ LOCAL_SRC_FILES := $(call all-java-files-under,$(src_dirs))
# bundled
#LOCAL_STATIC_JAVA_LIBRARIES += \
# android-common \
-# android-common-chips \
+# libchips \
# calendar-common
# unbundled
LOCAL_STATIC_JAVA_LIBRARIES := \
android-common \
- android-common-chips \
+ libchips \
colorpicker \
android-opt-datetimepicker \
android-opt-timezonepicker \