StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Work around incorrect R8 proguard compatibility"" am: 43aea42876

Browse Source 
am: 9200928f8c

Change-Id: I85598e4a79220ba5b13350d4a42c3e7ce89be63e
This commit is contained in:
Colin Cross
2018-06-05 14:02:33 -07:00
committed by android-build-merger
parent 6393783898 9200928f8c
commit a72f7db2eb
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java.mk
View File

@@ -463,9 +463,6 @@ endif
ifeq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),) ifeq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
# By default no obfuscation # By default no obfuscation
common_proguard_flags += -dontobfuscate common_proguard_flags += -dontobfuscate
# Workaround for b/80081393: R8 discards other attributes when
# -keepattributes *Annotations* is used, even when obfuscation is off.
common_proguard_flags += -keepattributes '*'
endif # No obfuscation endif # No obfuscation
ifeq ($(filter optimization,$(LOCAL_PROGUARD_ENABLED)),) ifeq ($(filter optimization,$(LOCAL_PROGUARD_ENABLED)),)
# By default no optimization # By default no optimization