From 8ff2a836624cc702103c54dc067907a69ccab332 Mon Sep 17 00:00:00 2001 From: Mark Chien Date: Tue, 31 May 2022 15:20:52 +0800 Subject: [PATCH] Fix jarjar rules for tethering apk Jarjar android.util.IndentingPrintWriter and android.hidl.base.V1_0.DebugInfo to a unique tethering specific package name. Bug: 233961539 Test: atest CtsTetheringTest Use apktool to unzip tethering apk and checking the result Change-Id: I564255ec8478a0385c389340da94f6ffadb66479 --- Tethering/jarjar-rules.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Tethering/jarjar-rules.txt b/Tethering/jarjar-rules.txt index 40eed3f4fc..904e491460 100644 --- a/Tethering/jarjar-rules.txt +++ b/Tethering/jarjar-rules.txt @@ -4,6 +4,7 @@ # module will be overwritten by the ones in the framework. rule com.android.internal.util.** com.android.networkstack.tethering.util.@1 rule android.util.LocalLog* com.android.networkstack.tethering.util.LocalLog@1 +rule android.util.IndentingPrintWriter* com.android.networkstack.tethering.util.AndroidUtilIndentingPrintWriter@1 rule android.net.shared.Inet4AddressUtils* com.android.networkstack.tethering.shared.Inet4AddressUtils@1 @@ -13,4 +14,7 @@ rule com.android.net.module.util.** com.android.networkstack.tethering.util.@1 # Classes from net-utils-device-common rule com.android.net.module.util.Struct* com.android.networkstack.tethering.util.Struct@1 -rule com.google.protobuf.** com.android.networkstack.tethering.protobuf@1 \ No newline at end of file +rule com.google.protobuf.** com.android.networkstack.tethering.protobuf@1 + +# Classes for hardware offload hidl interface +rule android.hidl.base.V1_0.DebugInfo* com.android.networkstack.tethering.hidl.base.V1_0.DebugInfo@1