From 314219882e8fa1f31fe8b7d02a59f37ae78cf04b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Thu, 2 Jan 2025 08:27:30 -0800
Subject: [PATCH] Proguard JNI methods
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Keep JNI methods globally instead of just specific class ones.

(cribbed from //packages/modules/Connectivity/service/proguard.flags)

Test: TreeHugger
Bug: 387287282
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2e8568855a7bad66233aa503ebd526c8826e0758
---
 Tethering/proguard.flags | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Tethering/proguard.flags b/Tethering/proguard.flags
index 47e284866b..6d857b103b 100644
--- a/Tethering/proguard.flags
+++ b/Tethering/proguard.flags
@@ -1,3 +1,6 @@
+# Keep JNI registered methods
+-keepclasseswithmembers,includedescriptorclasses class * { native <methods>; }
+
 # Keep class's integer static field for MessageUtils to parsing their name.
 -keepclassmembers class com.android.server.**,android.net.**,com.android.networkstack.** {
     static final % POLICY_*;
@@ -7,18 +10,6 @@
     static final % EVENT_*;
 }
 
--keep class com.android.networkstack.tethering.util.BpfMap {
-    native <methods>;
-}
-
--keep class com.android.networkstack.tethering.util.TcUtils {
-    native <methods>;
-}
-
--keep class com.android.networkstack.tethering.util.TetheringUtils {
-    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 {