summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2013-04-01 00:31:54 -0700
committerMichael Chan <mchan@android.com>2013-04-03 04:12:06 -0700
commite6aa93773f2132900f019fbbf203db4c30c5b254 (patch)
tree2d365debf2a1ec5bcbb19903b99d1471d6b54af4 /Android.mk
parent523cc4846b045c51d70ae59c9b66bc232eac807a (diff)
downloadandroid_packages_apps_Calendar-e6aa93773f2132900f019fbbf203db4c30c5b254.tar.gz
android_packages_apps_Calendar-e6aa93773f2132900f019fbbf203db4c30c5b254.tar.bz2
android_packages_apps_Calendar-e6aa93773f2132900f019fbbf203db4c30c5b254.zip
New time zone picker
Change-Id: I88b34b92c03e14e1812536314f4e2b846ff18276
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index c0aa8ccb..2393a883 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,8 @@ include $(CLEAR_VARS)
chips_dir := ../../../frameworks/ex/chips/res
color_picker_dir := ../../../frameworks/opt/colorpicker/res
datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res
-res_dirs := $(chips_dir) $(color_picker_dir) $(datetimepicker_dir) res
+timezonepicker_dir := ../../../frameworks/opt/timezonepicker/res
+res_dirs := $(chips_dir) $(color_picker_dir) $(datetimepicker_dir) $(timezonepicker_dir) res
src_dirs := src
LOCAL_EMMA_COVERAGE_FILTER := +com.android.calendar.*
@@ -26,6 +27,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-common-chips \
colorpicker \
android-opt-datetimepicker \
+ android-opt-timezonepicker \
android-support-v4 \
calendar-common
@@ -42,6 +44,7 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips
LOCAL_AAPT_FLAGS += --extra-packages com.android.colorpicker
LOCAL_AAPT_FLAGS += --extra-packages com.android.datetimepicker
+LOCAL_AAPT_FLAGS += --extra-packages com.android.timezonepicker
include $(BUILD_PACKAGE)