From f814b9b1ce44e504a0434c64469a13e3606b1cd4 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Thu, 29 Oct 2020 02:11:55 +0000 Subject: [PATCH 1/2] Add visibility rules for packages/modules/Connectivity/Tethering BUG: 167962976 Test: TH Change-Id: Id28881b35cf24fc9517fa11af6d8e539ab244fa6 --- Tethering/common/TetheringLib/Android.bp | 5 ++++- Tethering/tests/Android.bp | 1 + Tethering/tests/unit/Android.bp | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp index bf643cdcec..ddb6880753 100644 --- a/Tethering/common/TetheringLib/Android.bp +++ b/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/Tethering/tests/Android.bp b/Tethering/tests/Android.bp index cb0a20bdf0..731144cee0 100644 --- a/Tethering/tests/Android.bp +++ b/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/Tethering/tests/unit/Android.bp b/Tethering/tests/unit/Android.bp index 3589725dcf..956e2e8325 100644 --- a/Tethering/tests/unit/Android.bp +++ b/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", ] } From 1623eb61d5e753ca7a2c48bf41eefc235d3f79b1 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Thu, 29 Oct 2020 03:24:01 +0000 Subject: [PATCH 2/2] Add OWNERS block to prevent the tree from mooving during migration. BUG: 167962976 TEST: None. Change-Id: I49db5a11ee89645dac158ec3757180b2387e2d70 --- Tethering/OWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tethering/OWNERS b/Tethering/OWNERS index 5b42d49041..a6c21fc16b 100644 --- a/Tethering/OWNERS +++ b/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