commit ac931e8ac39835a2256ee47474a8e0b8e92035c0
author Christoffer Adamsen <christofferqa@google.com> Fri Jan 17 21:35:59 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 17 21:35:59 2025 -0800
tree 5f2fc3512dba389642e000fc7bf752e4ac07988a
parent 9c0e06f581dadb3d652dee390c6ea91b53727cf0
parent 166233a0760830c20a8cba3229f5c75cb95efe1e

Merge "Do not keep runtime invisible annotations in proguard.flags" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index a864ec3..ebec43c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,7 @@
     ],
 
     optimize: {
+        keep_runtime_invisible_annotations: true,
         proguard_flags_files: ["proguard.flags"],
     },
 

proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 4054922..8fbbf4b 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -50,7 +50,10 @@
 -keep interface android.support.v4.app.** { *; }
 -keep class com.actionbarsherlock.** { *; }
 -keep interface com.actionbarsherlock.** { *; }
--keepattributes *Annotation*
+-keepattributes RuntimeVisibleAnnotations,
+                RuntimeVisibleParameterAnnotations,
+                RuntimeVisibleTypeAnnotations,
+                AnnotationDefault
 
 # Required for JobIntentService
 -keep class androidx.core.app.CoreComponentFactory { *; }