joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Add jarjar rule for com.android.testutils.TestBpfMap

Browse source 
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
This commit is contained in:
Patrick Rohr 2022-02-03 21:41:28 +01:00
commit 3157918fc9
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Tethering/tests/jarjar-rules.txt
View file

@ -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*

1
tests/unit/jarjar-rules.txt
View file

@ -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