Merge "Revert "Work around incorrect R8 proguard compatibility"" am: 43aea42876
am: 9200928f8c
Change-Id: I85598e4a79220ba5b13350d4a42c3e7ce89be63e
This commit is contained in:
@@ -463,9 +463,6 @@ endif
|
||||
ifeq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
|
||||
# By default no obfuscation
|
||||
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
|
||||
ifeq ($(filter optimization,$(LOCAL_PROGUARD_ENABLED)),)
|
||||
# By default no optimization
|
||||
|
Reference in New Issue
Block a user