summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-12-28 19:04:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-12-28 19:04:00 +0000
commitf5db1f5e3f6c80eb069a388526d1b3edaf32edbe (patch)
treefb2c76bc015426ce09d92b0303c84e576e34c2e7 /Android.mk
parent85fb9ddcccad4be9899a0fd16660bc66bbe3c2b2 (diff)
parent11447d4c1a218358271bec3c40704e8605e9ef8f (diff)
downloadandroid_packages_apps_Messaging-f5db1f5e3f6c80eb069a388526d1b3edaf32edbe.tar.gz
android_packages_apps_Messaging-f5db1f5e3f6c80eb069a388526d1b3edaf32edbe.tar.bz2
android_packages_apps_Messaging-f5db1f5e3f6c80eb069a388526d1b3edaf32edbe.zip
Don't use LOCAL_PROGUARD_ENABLED := nosystem am: 86e0cae74b am: 2be03391bb
am: 11447d4c1a Change-Id: I6979b49eef9cc6143c6c21ef2b42c5edfa6acffc
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 6b51b96..c9ada0d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -55,11 +55,9 @@ else
LOCAL_REQUIRED_MODULES:= libframesequence libgiftranscode
endif
-LOCAL_PROGUARD_FLAGS := -ignorewarnings
+LOCAL_PROGUARD_ENABLED := obfuscation optimization
-LOCAL_PROGUARD_ENABLED := nosystem
-
-LOCAL_PROGUARD_FLAG_FILES := ../../../build/core/proguard_basic_keeps.flags proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
ifeq (eng,$(TARGET_BUILD_VARIANT))
LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
else