diff options
| author | 2025-01-28 06:43:06 -0800 | |
|---|---|---|
| committer | 2025-01-28 06:43:06 -0800 | |
| commit | 2db540c500131b59570c19d75ee72aa8ffd4e22b (patch) | |
| tree | 0a7d3952d4b3bb85d0071539604e608c251dc557 | |
| parent | 7716791c60f739d74abc2f2141db1f427a94fe52 (diff) | |
| parent | d49aaae1893eb3b39993bbccea9a23459c3731f5 (diff) | |
Merge "Do not keep runtime invisible annotations in proguard.proguard" into main am: 05527743ee am: d49aaae189
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3455326
Change-Id: Ic9b1f14cb5aa1c15f9c2ac8dbc7f9fe0e24d3f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/ExtShared/Android.bp | 1 | ||||
| -rw-r--r-- | packages/ExtShared/proguard.proguard | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/ExtShared/Android.bp b/packages/ExtShared/Android.bp index b1fd7f64292d..58016f78782a 100644 --- a/packages/ExtShared/Android.bp +++ b/packages/ExtShared/Android.bp @@ -38,6 +38,7 @@ android_app { aaptflags: ["--shared-lib"], export_package_resources: true, optimize: { + keep_runtime_invisible_annotations: true, proguard_flags_files: ["proguard.proguard"], }, } diff --git a/packages/ExtShared/proguard.proguard b/packages/ExtShared/proguard.proguard index e5dfbe1c453d..699fbdaaadad 100644 --- a/packages/ExtShared/proguard.proguard +++ b/packages/ExtShared/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 *; |