From ff8ff126c7bd71030517bbaa8a8bf5f172ffdb58 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Thu, 29 Oct 2020 02:11:55 +0000 Subject: Add visibility rules for packages/modules/Connectivity/Tethering BUG: 167962976 Test: TH Change-Id: Id28881b35cf24fc9517fa11af6d8e539ab244fa6 --- Android.bp | 1 + core/java/android/net/TEST_MAPPING | 2 +- packages/Tethering/common/TetheringLib/Android.bp | 5 ++++- packages/Tethering/tests/Android.bp | 1 + packages/Tethering/tests/unit/Android.bp | 1 + services/net/Android.bp | 5 ++++- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Android.bp b/Android.bp index 87b7dc10d31a..191b8bc862af 100644 --- a/Android.bp +++ b/Android.bp @@ -581,6 +581,7 @@ java_library { "//frameworks/base/apex/blobstore/framework", "//frameworks/base/apex/jobscheduler/framework", "//frameworks/base/packages/Tethering/tests/unit", + "//packages/modules/Connectivity/Tethering/tests/unit", ], } diff --git a/core/java/android/net/TEST_MAPPING b/core/java/android/net/TEST_MAPPING index abac81117deb..8c13ef98bedb 100644 --- a/core/java/android/net/TEST_MAPPING +++ b/core/java/android/net/TEST_MAPPING @@ -17,4 +17,4 @@ "path": "frameworks/opt/net/wifi" } ] -} \ No newline at end of file +} diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp index bf643cdcecc5..ddb6880753b4 100644 --- a/packages/Tethering/common/TetheringLib/Android.bp +++ b/packages/Tethering/common/TetheringLib/Android.bp @@ -16,7 +16,10 @@ java_sdk_library { name: "framework-tethering", defaults: ["framework-module-defaults"], - impl_library_visibility: ["//frameworks/base/packages/Tethering:__subpackages__"], + impl_library_visibility: [ + "//frameworks/base/packages/Tethering:__subpackages__", + "//packages/modules/Connectivity/Tethering:__subpackages__", + ], srcs: [":framework-tethering-srcs"], diff --git a/packages/Tethering/tests/Android.bp b/packages/Tethering/tests/Android.bp index cb0a20bdf0e8..731144cee0fb 100644 --- a/packages/Tethering/tests/Android.bp +++ b/packages/Tethering/tests/Android.bp @@ -19,5 +19,6 @@ filegroup { srcs: ["jarjar-rules.txt"], visibility: [ "//frameworks/base/packages/Tethering/tests:__subpackages__", + "//packages/modules/Connectivity/Tethering/tests:__subpackages__", ] } diff --git a/packages/Tethering/tests/unit/Android.bp b/packages/Tethering/tests/unit/Android.bp index 3589725dcf50..956e2e832589 100644 --- a/packages/Tethering/tests/unit/Android.bp +++ b/packages/Tethering/tests/unit/Android.bp @@ -77,6 +77,7 @@ android_library { defaults: ["TetheringTestsDefaults"], visibility: [ "//frameworks/base/packages/Tethering/tests/integration", + "//packages/modules/Connectivity/Tethering/tests/integration", ] } diff --git a/services/net/Android.bp b/services/net/Android.bp index afea1a073cab..72ad36677c23 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -66,5 +66,8 @@ filegroup { ":framework-annotations", "java/android/net/util/NetworkConstants.java", ], - visibility: ["//frameworks/base/packages/Tethering"], + visibility: [ + "//frameworks/base/packages/Tethering", + "//packages/modules/Connectivity/Tethering" + ], } -- cgit v1.2.3-59-g8ed1b From ce3114861676530a8b6f723a664d139e5068be31 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Thu, 29 Oct 2020 03:24:01 +0000 Subject: Add OWNERS block to prevent the tree from mooving during migration. BUG: 167962976 TEST: None. Change-Id: I49db5a11ee89645dac158ec3757180b2387e2d70 --- packages/Tethering/OWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Tethering/OWNERS b/packages/Tethering/OWNERS index 5b42d490411e..a6c21fc16bec 100644 --- a/packages/Tethering/OWNERS +++ b/packages/Tethering/OWNERS @@ -1,2 +1,2 @@ -include platform/packages/modules/NetworkStack/:/OWNERS -markchien@google.com +set noparent # while performing migration - b/167962976 +baligh@google.com -- cgit v1.2.3-59-g8ed1b