commit 2bf1dfe4af5fb89386a59b1e269313d3b44e1dd2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jan 17 18:18:23 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 17 18:18:23 2025 -0800
tree 9b1969ad71c56d2095f380b84483f965fdfc2265
parent a3e0b1af003219b62ff3fb28fc1df84a44f95e94
parent efcac11641234c1379ff4feff072ca22948631d0

Merge "Do not keep runtime invisible annotations in proguard.flags" into main

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.**