diff options
| author | 2025-02-06 10:42:04 -0800 | |
|---|---|---|
| committer | 2025-02-06 10:42:04 -0800 | |
| commit | 0b96c961d2aa2a3a75f68c549e2da12d6c542aac (patch) | |
| tree | 25c77c283d8901de3e2b390f9ffc5a116b1bac00 | |
| parent | b19471a436fb31622c29e8e18c91019babfc4fd4 (diff) | |
| parent | be3384b48f4b9c2aaaf8409d2723bb5986d83a99 (diff) | |
Merge "Do not keep runtime invisible annotations in proguard.proguard" into main am: 69c28d6924 am: be3384b48f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3455327
Change-Id: Ie2ff3db97fc2f6ed5ddff616591d54984f3ed67e
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 *; |