Do not keep runtime invisible annotations in proguard.flags am: b0f8c82e37 am: 817de4cf62
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/3455602
Change-Id: I874a545cfde2310b4714879d1d001c3c4f47737d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index fd0ed55..05fd866 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,6 +32,7 @@
soong_config_variables: {
build_variant_eng: {
optimize: {
+ keep_runtime_invisible_annotations: true,
proguard_flags_files: [
"proguard.flags",
"proguard-test.flags",
@@ -39,6 +40,7 @@
},
conditions_default: {
optimize: {
+ keep_runtime_invisible_annotations: true,
proguard_flags_files: [
"proguard.flags",
"proguard-release.flags",
diff --git a/proguard.flags b/proguard.flags
index 5531a9c..9c4c022 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -14,7 +14,12 @@
#
# Keep enough data for stack traces
-renamesourcefileattribute SourceFile
--keepattributes SourceFile,LineNumberTable,*Annotation*
+-keepattributes SourceFile,
+ LineNumberTable,
+ RuntimeVisibleAnnotations,
+ RuntimeVisibleParameterAnnotations,
+ RuntimeVisibleTypeAnnotations,
+ AnnotationDefault
# Keep classes and methods that have the guava @VisibleForTesting annotation
# TODO(b/373579455): Evaluate if <init> needs to be kept.