diff options
| author | Michael Chan <mchan@android.com> | 2013-04-03 06:12:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-03 06:12:11 -0700 |
| commit | 74684d00515a702e5fe18cce3514627beea5a430 (patch) | |
| tree | 9a2bc0abe216b54ddb930845f926ce7a3a6392cf /Android.mk | |
| parent | f64e8cd91bd6460c356643ef6eb75375121a7196 (diff) | |
| parent | e6aa93773f2132900f019fbbf203db4c30c5b254 (diff) | |
| download | android_packages_apps_Calendar-74684d00515a702e5fe18cce3514627beea5a430.tar.gz android_packages_apps_Calendar-74684d00515a702e5fe18cce3514627beea5a430.tar.bz2 android_packages_apps_Calendar-74684d00515a702e5fe18cce3514627beea5a430.zip | |
am e6aa9377: New time zone picker
* commit 'e6aa93773f2132900f019fbbf203db4c30c5b254':
New time zone picker
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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) |