commit f5db1f5e3f6c80eb069a388526d1b3edaf32edbe
author Colin Cross <ccross@android.com> Thu Dec 28 19:04:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 28 19:04:00 2017 +0000
tree fb2c76bc015426ce09d92b0303c84e576e34c2e7
parent 85fb9ddcccad4be9899a0fd16660bc66bbe3c2b2
parent 11447d4c1a218358271bec3c40704e8605e9ef8f

Don't use LOCAL_PROGUARD_ENABLED := nosystem am: 86e0cae74b am: 2be03391bb
am: 11447d4c1a

Change-Id: I6979b49eef9cc6143c6c21ef2b42c5edfa6acffc

Android.mk

diff --git a/Android.mk b/Android.mk
index 6b51b96..c9ada0d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -55,11 +55,9 @@
     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