diff options
| author | Sam Blitzstein <sblitz@google.com> | 2013-03-20 10:33:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-20 10:33:11 -0700 |
| commit | bb7014343111dd103adf5da6ffeb7442cce6642c (patch) | |
| tree | 7387f623e500fd2ae15a0ea8b20c5f7b5422b01c /Android.mk | |
| parent | 376ad3787332db0807c67845f103a5c2870d18b9 (diff) | |
| parent | 7674b690b018c31207830c2a196927a0c654486c (diff) | |
| download | android_packages_apps_Calendar-bb7014343111dd103adf5da6ffeb7442cce6642c.tar.gz android_packages_apps_Calendar-bb7014343111dd103adf5da6ffeb7442cce6642c.tar.bz2 android_packages_apps_Calendar-bb7014343111dd103adf5da6ffeb7442cce6642c.zip | |
am 7674b690: Added in new time picker library.
* commit '7674b690b018c31207830c2a196927a0c654486c':
Added in new time picker library.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 25 |
1 files changed, 14 insertions, 11 deletions
@@ -4,8 +4,8 @@ include $(CLEAR_VARS) # Include res dir from chips chips_dir := ../../../frameworks/ex/chips/res color_picker_dir := ../../../frameworks/opt/colorpicker/res - -res_dirs := $(chips_dir) $(color_picker_dir) res +datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res +res_dirs := $(chips_dir) $(color_picker_dir) $(datetimepicker_dir) res src_dirs := src LOCAL_EMMA_COVERAGE_FILTER := +com.android.calendar.* @@ -16,17 +16,18 @@ LOCAL_SRC_FILES := $(call all-java-files-under,$(src_dirs)) # bundled #LOCAL_STATIC_JAVA_LIBRARIES += \ -# android-common \ -# android-common-chips \ -# calendar-common +# android-common \ +# android-common-chips \ +# calendar-common # unbundled LOCAL_STATIC_JAVA_LIBRARIES := \ - android-common \ - android-common-chips \ - colorpicker \ - android-support-v4 \ - calendar-common + android-common \ + android-common-chips \ + colorpicker \ + android-opt-datetimepicker \ + android-support-v4 \ + calendar-common LOCAL_SDK_VERSION := current @@ -34,11 +35,13 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) LOCAL_PACKAGE_NAME := Calendar -LOCAL_PROGUARD_FLAG_FILES := proguard.flags +LOCAL_PROGUARD_FLAG_FILES := proguard.flags \ + ../../../frameworks/opt/datetimepicker/proguard.flags 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 include $(BUILD_PACKAGE) |