Merge "Revert "Work around incorrect R8 proguard compatibility""

This commit is contained in:
Colin Cross 2018-06-05 19:41:49 +00:00 committed by Gerrit Code Review
commit 43aea42876

View file

@ -458,9 +458,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