diff options
| author | James Lemieux <jplemieux@google.com> | 2014-07-11 14:24:42 -0700 |
|---|---|---|
| committer | James Lemieux <jplemieux@google.com> | 2014-07-11 14:24:42 -0700 |
| commit | 2b806edc62eb8e83c77edc471fda4652281a15c4 (patch) | |
| tree | bb19dfb12767f06bba9ae39532ab007726a56127 /Android.mk | |
| parent | 5f5c46534d46e3d73df79d6f9b4f7b4d2f621aa7 (diff) | |
| download | android_packages_apps_UnifiedEmail-2b806edc62eb8e83c77edc471fda4652281a15c4.tar.gz android_packages_apps_UnifiedEmail-2b806edc62eb8e83c77edc471fda4652281a15c4.tar.bz2 android_packages_apps_UnifiedEmail-2b806edc62eb8e83c77edc471fda4652281a15c4.zip | |
Replace all references to UnifiedEmail's com.android.oldbitmap with
equivalent usage of framework's com.android.bitmap.
A small refactor of AccountAvatarDrawable.drawBitmap(...) is also included
which produces no functional change.
Change-Id: Ic67690cde56de6ca691ac8647ef02865b766ca62
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 75a374751..8394ec762 100644 --- a/Android.mk +++ b/Android.mk @@ -20,8 +20,9 @@ chips_dir := ../../../frameworks/opt/chips/res #Include res dir from photoviewer photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res gridlayout_dir := ../../../frameworks/support/v7/gridlayout/res +bitmap_dir := ../../../frameworks/opt/bitmap/res datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res -res_dirs := res $(chips_dir) $(photo_dir) $(gridlayout_dir) $(datetimepicker_dir) +res_dirs := res $(chips_dir) $(photo_dir) $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir) ################################################## # Build APK @@ -37,6 +38,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-common LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 +LOCAL_STATIC_JAVA_LIBRARIES += android-opt-bitmap LOCAL_STATIC_JAVA_LIBRARIES += android-opt-datetimepicker LOCAL_STATIC_JAVA_LIBRARIES += owasp-html-sanitizer @@ -46,7 +48,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) \ $(call all-logtags-files-under, $(src_dirs)) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo:android.support.v7.gridlayout:com.android.datetimepicker +LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker LOCAL_PROGUARD_FLAG_FILES := proguard.flags |