commit ad08ef87054933d67e0ab1d7a7165b1f57fc6e18
author android-build-team Robot <android-build-team-robot@google.com> Sun Dec 31 08:25:54 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Dec 31 08:25:54 2017 +0000
tree fb2c76bc015426ce09d92b0303c84e576e34c2e7
parent 739aec86d2f140ff6309b615bc2edd3c435f82bd
parent f5db1f5e3f6c80eb069a388526d1b3edaf32edbe

Snap for 4521654 from f5db1f5e3f6c80eb069a388526d1b3edaf32edbe to pi-release

Change-Id: I052a3f0aac2851f90b885bea4e45a9e3d35b8440

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