From 3157918fc97939bb4b4f90200bb2bbc6fdee66e2 Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Thu, 3 Feb 2022 21:41:28 +0100 Subject: [PATCH] Add jarjar rule for com.android.testutils.TestBpfMap TestBpfMap needs to be jarjar'ed to work with ConnectivityCoverageTests which combines both framework tests and tethering tests (and their respective jarjar rules). Test: atest ConnectivityCoverageTests:BpfCoordinatorTest Change-Id: Ie3e7f0be9aeb848978f0df97be48100c808086bc --- Tethering/tests/jarjar-rules.txt | 3 +++ tests/unit/jarjar-rules.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/Tethering/tests/jarjar-rules.txt b/Tethering/tests/jarjar-rules.txt index 23d3f5603c..a7c7488e94 100644 --- a/Tethering/tests/jarjar-rules.txt +++ b/Tethering/tests/jarjar-rules.txt @@ -13,6 +13,9 @@ rule android.util.LocalLog* com.android.networkstack.tethering.util.LocalLog@1 # Classes from net-utils-framework-common rule com.android.net.module.util.** com.android.networkstack.tethering.util.@1 +# Classes from net-tests-utils +rule com.android.testutils.TestBpfMap* com.android.networkstack.tethering.testutils.TestBpfMap@1 + # TODO: either stop using frameworks-base-testutils or remove the unit test classes it contains. # TestableLooper from "testables" can be used instead of TestLooper from frameworks-base-testutils. zap android.os.test.TestLooperTest* diff --git a/tests/unit/jarjar-rules.txt b/tests/unit/jarjar-rules.txt index ca8867206d..eb3e32adce 100644 --- a/tests/unit/jarjar-rules.txt +++ b/tests/unit/jarjar-rules.txt @@ -1,2 +1,3 @@ # Module library in frameworks/libs/net rule com.android.net.module.util.** android.net.frameworktests.util.@1 +rule com.android.testutils.TestBpfMap* android.net.frameworktests.testutils.TestBpfMap@1