summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2019-06-25 22:31:26 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-25 22:31:26 -0700
commit6ad171623c8dbceee803c2dd9ac615bf6cf9957d (patch)
tree8febef95787ce12101ca47db1d05db474d6d9338
parentb56103416292df695146d9581e9830132aeb6f75 (diff)
parentc79e075ab4bffa810ae32a75de987c9d1efeedb1 (diff)
downloadUnifiedEmail-6ad171623c8dbceee803c2dd9ac615bf6cf9957d.tar.gz
Merge "Fix UnifiedEmail tests on userdebug builds." am: f9cde871ff
am: c79e075ab4 Change-Id: Ie44ee1df9888495e8e1366871bfa846f6516bc74
-rw-r--r--Android.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index b929cf9cb..eb10c5f99 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,9 +51,7 @@ LOCAL_USE_AAPT2 := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-ifeq (eng,$(TARGET_BUILD_VARIANT))
- LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
-endif
+LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.mail.*,com.android.emailcommon.*,com.google.android.mail.*