diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-08-19 13:57:33 -0700 |
|---|---|---|
| committer | Andrew Sapperstein <asapperstein@google.com> | 2014-08-19 13:57:33 -0700 |
| commit | a3341c3d4487a5f6ed10f68ea74904074da0691b (patch) | |
| tree | 5621a5851fee25667b94108f3572fc87dc00caa3 /Android.mk | |
| parent | 523d3073f6d81e1d1e8b3ad249cc82e7e3496e01 (diff) | |
| download | android_packages_apps_Email-a3341c3d4487a5f6ed10f68ea74904074da0691b.tar.gz android_packages_apps_Email-a3341c3d4487a5f6ed10f68ea74904074da0691b.tar.bz2 android_packages_apps_Email-a3341c3d4487a5f6ed10f68ea74904074da0691b.zip | |
Use appcompat photoviewer.
Change-Id: I4e551e393356f7039e5186cb3f9d9f40ac73cfb9
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index a7dbba5f5..94135c95d 100644 --- a/Android.mk +++ b/Android.mk @@ -23,7 +23,7 @@ include $(CLEAR_VARS) appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat/res chips_dir := ../../../frameworks/opt/chips/res unified_email_dir := ../UnifiedEmail -photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res +photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/appcompat/res emailcommon_dir := emailcommon gridlayout_dir := ../../../prebuilts/sdk/current/support/v7/gridlayout/res bitmap_dir := ../../../frameworks/opt/bitmap/res @@ -45,7 +45,8 @@ 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.emailcommon:com.android.ex.photo:android.support.v7.appcompat:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker -LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava libchips libphotoviewer +LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava libchips +LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer_appcompat LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout |