Add net-utils-framework-common to cts-net
In order to avoid class package missing problem, add net-utils-framework-common in cts net test build. Also jarjar the package name to prevent conflict. Test: build Test: atest DnsResolverTest Bug: 150952393 Change-Id: I40e2d4c4945a0579f6e1923e4722b09354ff050c
This commit is contained in:
@@ -36,19 +36,20 @@ java_defaults {
|
||||
"src/**/*.java",
|
||||
"src/**/*.kt",
|
||||
],
|
||||
|
||||
jarjar_rules: "jarjar-rules-shared.txt",
|
||||
static_libs: [
|
||||
"FrameworksNetCommonTests",
|
||||
"TestNetworkStackLib",
|
||||
"core-tests-support",
|
||||
"compatibility-device-util-axt",
|
||||
"core-tests-support",
|
||||
"cts-net-utils",
|
||||
"ctstestrunner-axt",
|
||||
"ctstestserver",
|
||||
"mockwebserver",
|
||||
"junit",
|
||||
"junit-params",
|
||||
"libnanohttpd",
|
||||
"mockwebserver",
|
||||
"net-utils-framework-common",
|
||||
"truth-prebuilt",
|
||||
],
|
||||
|
||||
|
||||
2
tests/cts/net/jarjar-rules-shared.txt
Normal file
2
tests/cts/net/jarjar-rules-shared.txt
Normal file
@@ -0,0 +1,2 @@
|
||||
# Module library in frameworks/libs/net
|
||||
rule com.android.net.module.util.** android.net.cts.util.@1
|
||||
Reference in New Issue
Block a user