Don't use LOCAL_PROGUARD_ENABLED := nosystem

This is the only user of nosystem, and it doesn't seem to serve
any purpose since most of the system flags are then manually
included back again.  Switch to optimization + obfuscation and
let the build system provide the correct flags file.

Test: classes.dex is identical, classes-proguard.jar differs only
      in removed StackMapTable sections (from -dontpreverify?).

Change-Id: I6bae85d10311a982d68cc296a441196ee3115c3d
This commit is contained in:
Colin Cross
2017-12-27 18:53:41 -08:00
parent 13ade30481
commit 86e0cae74b

View File

@@ -64,11 +64,9 @@ else
LOCAL_REQUIRED_MODULES:= libframesequence libgiftranscode LOCAL_REQUIRED_MODULES:= libframesequence libgiftranscode
endif endif
LOCAL_PROGUARD_FLAGS := -ignorewarnings LOCAL_PROGUARD_ENABLED := obfuscation optimization
LOCAL_PROGUARD_ENABLED := nosystem LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_PROGUARD_FLAG_FILES := ../../../build/core/proguard_basic_keeps.flags proguard.flags
ifeq (eng,$(TARGET_BUILD_VARIANT)) ifeq (eng,$(TARGET_BUILD_VARIANT))
LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
else else