From c8148cc00127c25d5cde8b64dbfe0d37340ee035 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 4 Jun 2018 17:25:56 +0000
Subject: [PATCH] Revert "Work around incorrect R8 proguard compatibility"

This reverts commit cf5180c19849638a1c396e72603888ca43c7b152.

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
---
 core/java.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/java.mk b/core/java.mk
index c6b4ffb253..8e5fd1df84 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -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