From 5f44ed3e7e627a09424f70bf6d2828119976e239 Mon Sep 17 00:00:00 2001 From: Chidera Olibie Date: Thu, 23 Mar 2023 03:51:00 +0000 Subject: [PATCH] Fix `symbol not found` error for hidden apis used by MTS This fails to build on git_master when depending on `sdk_version:module-current` and `libs:["framework-tethering-pre-jarjar"]. AIUI, some builds use sdk prebuilts that have compiled out some of the hidden apis. And thus fails with symbol not found. So we depend on the impl version of frame-tethering so we always have access to these hidden apis for MTS. Test: atestNetHttpCoverageTests Change-Id: Id68a9051b9f8566f9ca42142669150a6db8b0925 --- Cronet/tests/mts/Android.bp | 4 +++- Tethering/common/TetheringLib/Android.bp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp index 0c0d611f7f..adbc3844dc 100644 --- a/Cronet/tests/mts/Android.bp +++ b/Cronet/tests/mts/Android.bp @@ -47,7 +47,9 @@ android_library { ], 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 4f95bdde34..74170cb6f6 100644 --- a/Tethering/common/TetheringLib/Android.bp +++ b/Tethering/common/TetheringLib/Android.bp @@ -54,6 +54,7 @@ java_sdk_library { "//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",