Make ConnectivityManagerTest use the API shims.
This is required for the code to be identical in AOSP and
mainline-prod.
Bug: 167645754
Test: atest CtsNetTestCases passes on AOSP device
Test: atest CtsNetTestCasesLatestSdk passes on AOSP device
Test: atest CtsNetTestCasesLatestSdk passes on R device
Change-Id: I094906e535d710a46a3fa833b6aa48cb007d6b63
diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp
index bbfb2c1..62160df 100644
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -43,7 +43,6 @@
static_libs: [
"bouncycastle-unbundled",
"FrameworksNetCommonTests",
- "TestNetworkStackLib",
"core-tests-support",
"cts-net-utils",
"ctstestrunner-axt",
@@ -66,6 +65,10 @@
android_test {
name: "CtsNetTestCases",
defaults: ["CtsNetTestCasesDefaults"],
+ // TODO: CTS should not depend on the entirety of the networkstack code.
+ static_libs: [
+ "NetworkStackApiCurrentLib",
+ ],
test_suites: [
"cts",
"general-tests",
@@ -79,6 +82,10 @@
android_test {
name: "CtsNetTestCasesLatestSdk",
defaults: ["CtsNetTestCasesDefaults"],
+ // TODO: CTS should not depend on the entirety of the networkstack code.
+ static_libs: [
+ "NetworkStackApiStableLib",
+ ],
jni_uses_sdk_apis: true,
min_sdk_version: "29",
target_sdk_version: "30",