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

am: 43aea42876

Change-Id: I19f16204c4ca0d4bb1bfd0c28ab5baf8b6b52b3e
This commit is contained in:
Colin Cross
2018-06-05 12:53:13 -07:00
committed by android-build-merger

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