Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8148cc0 authored by Colin Cross's avatar Colin Cross
Browse files

Revert "Work around incorrect R8 proguard compatibility" 

This reverts commit cf5180c1.

Reason for revert: r8 behaves more like proguard now.

Bug: 80081393
Test: m checkbuild
Test: examine attributes on com.android.stk.BootCompletedReceiver
      in out/target/common/obj/APPS/Stk_intermediates/classes.dex

Change-Id: I6cff1d7cb6b71023399db6492455f69328dd73f3
parent cf5180c1

core/java.mk

+0 −3
Original line number Diff line number Diff line
@@ -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