diff options
| author | Régis Décamps <regisd@google.com> | 2014-10-14 15:38:16 +0200 |
|---|---|---|
| committer | Régis Décamps <regisd@google.com> | 2014-10-15 16:28:47 +0200 |
| commit | d26036f4b6b7ffc803f5c5648dbe41a15cc946d5 (patch) | |
| tree | f574b174731c4be4b25227bfb675284667397b92 /Android.mk | |
| parent | 1e550a0f91e1050d124a6713b89b82c641281705 (diff) | |
| download | android_packages_apps_UnifiedEmail-d26036f4b6b7ffc803f5c5648dbe41a15cc946d5.tar.gz android_packages_apps_UnifiedEmail-d26036f4b6b7ffc803f5c5648dbe41a15cc946d5.tar.bz2 android_packages_apps_UnifiedEmail-d26036f4b6b7ffc803f5c5648dbe41a15cc946d5.zip | |
Fix NoClassDefFound in tests with proguard-test.flags
Explicitely keep classes used for tests in `proguard-test.flags`
applied when the target is eng.
Bug: 17388964 Fix the Gmail test suite
Change-Id: I91b38ac7c8e07aeb9006d2587dd25852dc937147
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 53c7cb27b..d00c9c179 100644 --- a/Android.mk +++ b/Android.mk @@ -53,6 +53,9 @@ 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_PROGUARD_FLAG_FILES := proguard.flags +ifeq (eng,$(TARGET_BUILD_VARIANT)) + LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags +endif LOCAL_EMMA_COVERAGE_FILTER := +com.android.mail.*, +com.android.emailcommon.*, +com.google.android.mail.* |