diff options
| author | Kenshin <foufou33@gmail.com> | 2015-03-12 13:54:52 -0700 |
|---|---|---|
| committer | LorDClockaN <davor@losinj.com> | 2015-03-13 15:24:13 +0100 |
| commit | 6c92ed95f896f67d08f3646e7be4bba9948d6a8c (patch) | |
| tree | c4cadedb7ccc8934d9273f036b2abed9a8fdf343 | |
| parent | 0bb24ff0413e9ae72efe2f483a124af60f9a9596 (diff) | |
UnifiedEmail: Fix buildlp5.0
Change-Id: I180829783123498b1c6a06b0d877e9ce451429b0
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | proguard.flags | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index ef3693a5c..62e8d1255 100644 --- a/Android.mk +++ b/Android.mk @@ -43,6 +43,7 @@ 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 +LOCAL_STATIC_JAVA_LIBRARIES += com.android.emailcommon LOCAL_SDK_VERSION := current @@ -50,7 +51,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.appcompat:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker +LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo:android.support.v7.appcompat:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker:com.android.emailcommon LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/proguard.flags b/proguard.flags index 7267eabb8..2c350ceea 100644 --- a/proguard.flags +++ b/proguard.flags @@ -5,6 +5,7 @@ -dontwarn android.support.v4.** -dontwarn android.support.v13.** -dontwarn com.android.ex.photo.** +-dontwarn com.android.emailcommon.** # keep names that are used by reflection, or from javascript |