Merge "Fix `symbol not found` error for hidden apis used by MTS" am: 8d4702a1f0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2505055
Change-Id: I2fd0071d0689db59fa81f29cddfe6fa6c6ea4b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp
index 0c0d611..adbc384 100644
--- a/Cronet/tests/mts/Android.bp
+++ b/Cronet/tests/mts/Android.bp
@@ -47,7 +47,9 @@
],
libs: [
"android.test.base",
- "framework-tethering-pre-jarjar",
+ // Needed for direct access to tethering's hidden apis and to avoid `symbol not found`
+ // errors on some builds.
+ "framework-tethering.impl",
],
lint: { test: true }
}
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index 58719d6..ec8cede 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -54,6 +54,7 @@
"//packages/modules/CaptivePortalLogin/tests",
"//packages/modules/Connectivity/Tethering/tests:__subpackages__",
"//packages/modules/Connectivity/tests:__subpackages__",
+ "//packages/modules/Connectivity/Cronet/tests:__subpackages__",
"//packages/modules/IPsec/tests/iketests",
"//packages/modules/NetworkStack/tests:__subpackages__",
"//packages/modules/Wifi/service/tests/wifitests",