diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-28 20:26:43 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-28 20:26:43 +0000 |
| commit | 859e1e9302a47fd1cf5167cc43fbda10b1e051ac (patch) | |
| tree | 205a7df644a3c041b065d01177eb189795285c8a /Android.mk | |
| parent | 192234c1485b1cf5f1177b5e3c5ea1ef58ae74e8 (diff) | |
| parent | 1bfde93e51219462769a0251172c9d27e7642cb4 (diff) | |
| download | Email-859e1e9302a47fd1cf5167cc43fbda10b1e051ac.tar.gz | |
Snap for 6439596 from 1bfde93e51219462769a0251172c9d27e7642cb4 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release
Change-Id: I9ececdcebb03be297a9ef636b616a7c22037e1a4
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 41b04fd6c..c354471bd 100644 --- a/Android.mk +++ b/Android.mk @@ -38,13 +38,13 @@ LOCAL_ASSET_DIR := $(LOCAL_PATH)/$(unified_email_dir)/assets LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_AAPT_FLAGS += --extra-packages com.android.mail:com.android.email:com.android.emailcommon -LOCAL_AAPT_FLAGS += --legacy LOCAL_STATIC_ANDROID_LIBRARIES := \ com.android.emailcommon \ libchips \ libphotoviewer_appcompat \ android-opt-bitmap \ + android-opt-datetimepicker \ androidx.core_core \ androidx.media_media \ androidx.legacy_legacy-support-core-utils \ @@ -67,13 +67,16 @@ LOCAL_PACKAGE_NAME := Email LOCAL_PRODUCT_MODULE := true LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(unified_email_dir)/proguard.flags -LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags +ifeq (eng,$(TARGET_BUILD_VARIANT)) + LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags +endif LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := general-tests - include $(BUILD_PACKAGE) +# only include rules to build other stuff for the original package, not the derived package. +ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),) # additionally, build unit tests in a separate .apk include $(call all-makefiles-under,$(LOCAL_PATH)) +endif |