diff options
| author | Michael Chan <mchan@android.com> | 2013-02-25 16:44:23 -0800 |
|---|---|---|
| committer | Michael Chan <mchan@android.com> | 2013-02-25 16:44:23 -0800 |
| commit | 8ee471e8aa58cd01693c7cb1a162f40adf041fde (patch) | |
| tree | a21993fb7370b9f162b6c2e0a2e160638489776e /Android.mk | |
| parent | 7ba3af1eede63c8771bf3b007c0e13760898a931 (diff) | |
| parent | 666123ec1274420a77ace01e32df70baf87fca57 (diff) | |
| download | android_packages_apps_Calendar-8ee471e8aa58cd01693c7cb1a162f40adf041fde.tar.gz android_packages_apps_Calendar-8ee471e8aa58cd01693c7cb1a162f40adf041fde.tar.bz2 android_packages_apps_Calendar-8ee471e8aa58cd01693c7cb1a162f40adf041fde.zip | |
Merge remote-tracking branch 'goog/ics-ub-calendar-cream' into catchup
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -3,7 +3,9 @@ include $(CLEAR_VARS) # Include res dir from chips chips_dir := ../../../frameworks/ex/chips/res -res_dirs := $(chips_dir) res +color_picker_dir := ../../../frameworks/opt/colorpicker/res + +res_dirs := $(chips_dir) $(color_picker_dir) res src_dirs := src LOCAL_EMMA_COVERAGE_FILTER := +com.android.calendar.* @@ -22,6 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under,$(src_dirs)) LOCAL_STATIC_JAVA_LIBRARIES := \ android-common \ android-common-chips \ + colorpicker \ android-support-v4 \ calendar-common @@ -35,6 +38,7 @@ LOCAL_PROGUARD_FLAG_FILES := 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 include $(BUILD_PACKAGE) |