From 4ed9942546e3c3f1ba5ef1b3220aeebb858adc0f Mon Sep 17 00:00:00 2001
From: Jared Duke <jdduke@google.com>
Date: Tue, 19 Apr 2022 21:45:04 +0000
Subject: [PATCH] Fix R8 full mode for Tethering

Ensure runtime-visible field annotations are properly preserved
when using R8 full mode.

Bug: 215530220
Change-Id: I3d09fa122a03e5c86cbefc68e7dfabd56241dcfe
Test: m + presubmit
---
 Tethering/proguard.flags | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Tethering/proguard.flags b/Tethering/proguard.flags
index 7b5ae0dfbe..2905e283bb 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 {
     *;
 }