0015f04ec7
Using jarjar on intermediate libraries causes issues when they are
combined with other libraries that use different jarjar rules, as the
resulting binary may contain multiple incompatible copies of the
classes. Instead, jarjar should be used on the final artifact, after
combining the libraries.
Ensure NetworkStackJarJarRules is not applied on intermediate libraries
like TetheringIntegrationTestsLib, but instead apply it on
TetheringIntegrationTests or CtsTetheringTest.
Bug: 192535368
Test: atest TetheringCoverageTests TetheringIntegrationTests \
CtsTetheringTest
Change-Id: I248a533651984de81f676336c0e74e3788610bbb
25 lines
1.7 KiB
Plaintext
25 lines
1.7 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* com.android.networkstack.tethering.util.IndentingPrintWriter@1
|
|
rule com.android.internal.util.IState* com.android.networkstack.tethering.util.IState@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
|
|
|
|
# Classes from net-utils-framework-common
|
|
rule com.android.net.module.util.** com.android.networkstack.tethering.util.@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*
|
|
|
|
# When used in combined test suites like ConnectivityCoverageTests, these test jarjar rules are
|
|
# combined with the jarjar-rules.txt of other included modules (like NetworkStack jarjar rules).
|
|
# They will effectively be added after the following line break. Note that jarjar stops at the first
|
|
# matching rule, so any rule in this file takes precedence over rules in the following ones.
|