Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab50cb42 authored Sep 23, 2020 by Remi NGUYEN VAN Committed by Lev Rumyantsev Sep 24, 2020

Remove unused testutils lib from tethering tests

frameworks-base-testutils is unused in tethering integration tests, so
the dependency can be removed.
That test library also contains test classes, so removing the dependency
allows tethering tests to stop running the associated tests.

Also add jarjar rules to the unit tests to zap (remove) the test classes
from the output APK. Ideally the unit tests should stop depending on
that library too (TestableLooper can be used instead of TestLooper), or
the frameworks-base-testutils library should stop including test
classes.

Bug: 167968946
Test: m CtsTetheringTest TetheringTests
Change-Id: Ie950ce5b6181e388a7f71da430fd2dd8ada32e49
(cherry picked from commit daed646e)

parent ebc11f1b

packages/Tethering/tests/integration/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ java_defaults {
		static_libs: [
		"NetworkStackApiStableLib",
		"androidx.test.rules",
		"frameworks-base-testutils",
		"mockito-target-extended-minus-junit4",
		"net-tests-utils",
		"testables",

packages/Tethering/tests/unit/jarjar-rules.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -9,3 +9,8 @@ rule com.android.internal.util.StateMachine* com.android.networkstack.tethering.
		rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.tethering.util.TrafficStatsConstants@1

		rule android.util.LocalLog* com.android.networkstack.tethering.util.LocalLog@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*
		zap com.android.test.filters.SelectTestTests*
		No newline at end of file