commit 2be03391bb99aa4d0f587299961a858768c23707
author Colin Cross <ccross@android.com> Thu Dec 28 18:46:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 28 18:46:57 2017 +0000
tree da48799916aacf8351c6bbd02693f2cd6433b2de
parent 4825219c587739e2e059bb57dca167898c0ffe10
parent 86e0cae74b46333cc27ac38eedf95220c696d4df

Don't use LOCAL_PROGUARD_ENABLED := nosystem
am: 86e0cae74b

Change-Id: I862ac79b88560dd51fd9f6cdb8ce2c0dbcc7016d

Android.mk

diff --git a/Android.mk b/Android.mk
index 06ac9e6..37f293b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,11 +64,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