commit 498919b44c559f513190a0d6a5b5d70ad4927e06
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 20 06:39:13 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 20 06:39:13 2022 +0000
tree 49979d137e19553e95d0c21439c42dbfcfee46a7
parent c4379c24400554d2a130b14d7f8af169a0a7d9ee
parent 4ed9942546e3c3f1ba5ef1b3220aeebb858adc0f

Merge "Fix R8 full mode for Tethering"

Tethering/proguard.flags

diff --git a/Tethering/proguard.flags b/Tethering/proguard.flags
index 7b5ae0d..2905e28 100644
--- a/Tethering/proguard.flags
+++ b/Tethering/proguard.flags
@@ -12,6 +12,11 @@
     native <methods>;
 }
 
+# Ensure runtime-visible field annotations are kept when using R8 full mode.
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+-keep interface com.android.networkstack.tethering.util.Struct$Field {
+    *;
+}
 -keepclassmembers public class * extends com.android.networkstack.tethering.util.Struct {
     *;
 }