summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christoffer Adamsen <christofferqa@google.com> 2025-01-17 04:47:10 -0800
committer Christoffer Adamsen <christofferqa@google.com> 2025-01-17 04:49:32 -0800
commitd5442060d4b0205ad78e46a62786a0d882effc2f (patch)
tree3c7e19524c97fd1921c9cf3b0792b7ef976f8ca8
parentccc9a84f2f124c8ad472ef0312a5fb7435c980b6 (diff)
Do not keep runtime invisible annotations in proguard.proguard
This updates the corresponding Android.bp file to keep the runtime invisible annotations, meaning this should be a no-op. When RELEASE_R8_ONLY_RUNTIME_VISIBLE_ANNOTATIONS is enabled, keep_runtime_invisible_annotations will become a no-op, which should lead to all runtime invisible annotations being stripped from this build. Bug: 387958004 Change-Id: Ie4869e27ff5d6839e2565178a1765aad4ce661dc Test: existing
-rw-r--r--tests/SharedLibrary/lib/Android.bp1
-rw-r--r--tests/SharedLibrary/lib/proguard.proguard4
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/SharedLibrary/lib/Android.bp b/tests/SharedLibrary/lib/Android.bp
index 0595cb1e116a..abfd0e869b45 100644
--- a/tests/SharedLibrary/lib/Android.bp
+++ b/tests/SharedLibrary/lib/Android.bp
@@ -15,6 +15,7 @@ android_app {
export_package_resources: true,
privileged: true,
optimize: {
+ keep_runtime_invisible_annotations: true,
proguard_flags_files: ["proguard.proguard"],
},
}
diff --git a/tests/SharedLibrary/lib/proguard.proguard b/tests/SharedLibrary/lib/proguard.proguard
index e5dfbe1c453d..699fbdaaadad 100644
--- a/tests/SharedLibrary/lib/proguard.proguard
+++ b/tests/SharedLibrary/lib/proguard.proguard
@@ -1,6 +1,8 @@
-keepparameternames
-keepattributes Exceptions,InnerClasses,Signature,Deprecated,
- SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
+ SourceFile,LineNumberTable,EnclosingMethod,
+ RuntimeVisibleAnnotations,RuntimeVisibleParameterAnnotations,
+ RuntimeVisibleTypeAnnotations,AnnotationDefault
-keep public class * {
public protected *;