diff options
| author | Yu Ping Hu <yph@google.com> | 2013-03-14 19:58:21 -0700 |
|---|---|---|
| committer | Yu Ping Hu <yph@google.com> | 2013-03-19 19:45:52 -0700 |
| commit | 9ae81e2af07219bfad26c882516343e83c16d926 (patch) | |
| tree | 5360b59ff5893ebec71d827539970833640832c2 /Android.mk | |
| parent | 24e165323e5a1d834dba1e0cef0677302e41b5ec (diff) | |
| download | android_packages_apps_Email-9ae81e2af07219bfad26c882516343e83c16d926.tar.gz android_packages_apps_Email-9ae81e2af07219bfad26c882516343e83c16d926.tar.bz2 android_packages_apps_Email-9ae81e2af07219bfad26c882516343e83c16d926.zip | |
Move system folder string resources to emailcommon.
This permits us to move shared code for looking up system
folder names to emailcommon, which is also in this change.
Also renames emailcommon2 to emailcommon.
This is part of a multi-project submit with
I4a071a07c3e33aaa4ea404eb66a8db1eabc9ef0e and
I5746c0353783f9b29d52d6540472588c6542a6a2.
Bug: 8383232
Change-Id: I6c6eec4f1bcf2abd54c1ed05da1add8d894ee403
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 8d61024a2..cc9a53549 100644 --- a/Android.mk +++ b/Android.mk @@ -19,11 +19,12 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -# Include res dir from chips, unified, and photoviewer +# Include res dir from chips, unified, emailcommon, and photoviewer chips_dir := ../../../frameworks/ex/chips/res unified_email_dir := ../UnifiedEmail photo_dir := ../../../frameworks/opt/photoviewer/res -res_dir := $(chips_dir) res $(unified_email_dir)/res $(photo_dir) build/res +emailcommon_dir := emailcommon +res_dir := $(chips_dir) res $(unified_email_dir)/res $(photo_dir) $(emailcommon_dir)/res build/res LOCAL_MODULE_TAGS := optional @@ -38,9 +39,9 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir)) LOCAL_ASSET_DIR := $(LOCAL_PATH)/$(unified_email_dir)/assets LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.ex.photo +LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.emailcommon:com.android.ex.photo -LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon2 com.android.emailsync guava android-common-chips libphotoviewer +LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon com.android.emailsync guava android-common-chips libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 |