diff options
| author | 2025-02-06 04:29:42 -0800 | |
|---|---|---|
| committer | 2025-02-06 04:29:42 -0800 | |
| commit | be3384b48f4b9c2aaaf8409d2723bb5986d83a99 (patch) | |
| tree | 865df1c9b9a55c34f5881d4e36ba0a6298f79878 | |
| parent | 1b083d88f190f2447f22ed9b9ca9eee8e008d286 (diff) | |
| parent | 69c28d692497cb810491b3b0dd373b112e517d74 (diff) | |
Merge "Do not keep runtime invisible annotations in proguard.proguard" into main am: 69c28d6924
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3455327
Change-Id: I760c005606cec87f05908377c14e2d1f2f95a89d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/SharedLibrary/lib/Android.bp | 1 | ||||
| -rw-r--r-- | tests/SharedLibrary/lib/proguard.proguard | 4 |
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 *; |