8f59ec090d
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
16 lines
1.2 KiB
Plaintext
16 lines
1.2 KiB
Plaintext
# Don't jar-jar the entire package because this test use some
|
|
# internal classes (like ArrayUtils in com.android.internal.util)
|
|
rule com.android.internal.util.BitUtils* com.android.networkstack.tethering.util.BitUtils@1
|
|
rule com.android.internal.util.IndentingPrintWriter.java* com.android.networkstack.tethering.util.IndentingPrintWriter.java@1
|
|
rule com.android.internal.util.IState.java* com.android.networkstack.tethering.util.IState.java@1
|
|
rule com.android.internal.util.MessageUtils* com.android.networkstack.tethering.util.MessageUtils@1
|
|
rule com.android.internal.util.State* com.android.networkstack.tethering.util.State@1
|
|
rule com.android.internal.util.StateMachine* com.android.networkstack.tethering.util.StateMachine@1
|
|
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* |