commit fee1333156dea4a68c1b6a46e9d5b97946c10de2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jan 17 18:46:02 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 17 18:46:02 2025 -0800
tree 960472d0ae8f0eae3bbe19cf119bca86373237b0
parent 6a0162e26789f1476b3c0f2f97ed5f44f9a25c96
parent 2bf1dfe4af5fb89386a59b1e269313d3b44e1dd2

Merge "Do not keep runtime invisible annotations in proguard.flags" into main am: 2bf1dfe4af

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3452837

Change-Id: I4bf3bb3d0b7fc9c04e41919fbc3266ed6bf530be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/TerminalApp/Android.bp

diff --git a/android/TerminalApp/Android.bp b/android/TerminalApp/Android.bp
index 545ba0f..79f0094 100644
--- a/android/TerminalApp/Android.bp
+++ b/android/TerminalApp/Android.bp
@@ -40,6 +40,7 @@
         //optimize: true,
         proguard_flags_files: ["proguard.flags"],
         shrink_resources: true,
+        keep_runtime_invisible_annotations: true,
     },
     apex_available: [
         "com.android.virt",

android/TerminalApp/proguard.flags

diff --git a/android/TerminalApp/proguard.flags b/android/TerminalApp/proguard.flags
index 88b8a9c..04a2140 100644
--- a/android/TerminalApp/proguard.flags
+++ b/android/TerminalApp/proguard.flags
@@ -4,7 +4,10 @@
 -keepattributes Signature
 
 # For using GSON @Expose annotation
--keepattributes *Annotation*
+-keepattributes RuntimeVisibleAnnotations,
+                RuntimeVisibleParameterAnnotations,
+                RuntimeVisibleTypeAnnotations,
+                AnnotationDefault
 
 # Gson specific classes
 -dontwarn sun.misc.**