From 720ad7c026b96cb9ce0595090467bc7deebbe488 Mon Sep 17 00:00:00 2001 From: Aaron Huang <huangaaron@google.com> Date: Wed, 26 Jan 2022 00:43:10 +0800 Subject: [PATCH] Have connectivity targets be visible to Frameworks[Vcn|Ike]Tests (cherry picked from commit 7174ac3d86d1646a1b8dde88a29d8a06109b5988) Bug: 204153604 Ignore-AOSP-First: part of large topic that only builds internally Test: build, FrameworksVcnTests, FrameworksIkeTests Change-Id: I40740200fe4a7476a21bb5330429a11c97e38fb8 Merged-In: I40740200fe4a7476a21bb5330429a11c97e38fb8 --- Tethering/common/TetheringLib/Android.bp | 2 ++ framework-t/Android.bp | 2 ++ framework/Android.bp | 2 ++ service-t/Android.bp | 2 ++ 4 files changed, 8 insertions(+) diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp index c82a9937bf..51c200bc57 100644 --- a/Tethering/common/TetheringLib/Android.bp +++ b/Tethering/common/TetheringLib/Android.bp @@ -27,12 +27,14 @@ java_sdk_library { "//cts/tests/netlegacy22.api", "//external/sl4a:__subpackages__", "//frameworks/base/packages/Connectivity/tests:__subpackages__", + "//frameworks/base/tests/vcn", "//frameworks/libs/net/common/testutils", "//frameworks/libs/net/common/tests:__subpackages__", "//frameworks/opt/telephony/tests/telephonytests", "//packages/modules/CaptivePortalLogin/tests", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", "//packages/modules/Connectivity/tests:__subpackages__", + "//packages/modules/IPsec/tests/iketests", "//packages/modules/NetworkStack/tests:__subpackages__", "//packages/modules/Wifi/service/tests/wifitests", ], diff --git a/framework-t/Android.bp b/framework-t/Android.bp index b5aedeb0da..e0e781893c 100644 --- a/framework-t/Android.bp +++ b/framework-t/Android.bp @@ -89,12 +89,14 @@ java_sdk_library { "//cts/tests/netlegacy22.api", "//cts/tests/tests/app.usage", // NetworkUsageStatsTest "//external/sl4a:__subpackages__", + "//frameworks/base/tests/vcn", "//frameworks/libs/net/common/testutils", "//frameworks/libs/net/common/tests:__subpackages__", "//frameworks/opt/telephony/tests/telephonytests", "//packages/modules/CaptivePortalLogin/tests", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", "//packages/modules/Connectivity/tests:__subpackages__", + "//packages/modules/IPsec/tests/iketests", "//packages/modules/NetworkStack/tests:__subpackages__", "//packages/modules/Nearby/tests:__subpackages__", "//packages/modules/Wifi/service/tests/wifitests", diff --git a/framework/Android.bp b/framework/Android.bp index d3e46fadc0..921c4fb1fa 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -131,12 +131,14 @@ java_sdk_library { "//cts/tests/tests/app.usage", // NetworkUsageStatsTest "//external/sl4a:__subpackages__", "//frameworks/base/packages/Connectivity/tests:__subpackages__", + "//frameworks/base/tests/vcn", "//frameworks/libs/net/common/testutils", "//frameworks/libs/net/common/tests:__subpackages__", "//frameworks/opt/telephony/tests/telephonytests", "//packages/modules/CaptivePortalLogin/tests", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", "//packages/modules/Connectivity/tests:__subpackages__", + "//packages/modules/IPsec/tests/iketests", "//packages/modules/NetworkStack/tests:__subpackages__", "//packages/modules/Wifi/service/tests/wifitests", ], diff --git a/service-t/Android.bp b/service-t/Android.bp index f33be63452..96ed5110ec 100644 --- a/service-t/Android.bp +++ b/service-t/Android.bp @@ -52,7 +52,9 @@ java_library { "com.android.tethering", ], visibility: [ + "//frameworks/base/tests/vcn", "//packages/modules/Connectivity/service", "//packages/modules/Connectivity/tests:__subpackages__", + "//packages/modules/IPsec/tests/iketests", ], } -- GitLab