diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-29 07:15:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-29 07:15:03 +0000 |
| commit | 39c6068cbc112c990ec7f7f319d2ffa9d30a9d85 (patch) | |
| tree | aa521cc4b9d3b7810098cb481fd6e53bb80cd203 | |
| parent | d8288fe344816ddb2e8545582acb2383e94d970c (diff) | |
| parent | ce3114861676530a8b6f723a664d139e5068be31 (diff) | |
Merge changes from topic "bug_167962976_visibility"
* changes:
Add OWNERS block to prevent the tree from mooving during migration.
Add visibility rules for packages/modules/Connectivity/Tethering
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | core/java/android/net/TEST_MAPPING | 2 | ||||
| -rw-r--r-- | packages/Tethering/OWNERS | 4 | ||||
| -rw-r--r-- | packages/Tethering/common/TetheringLib/Android.bp | 5 | ||||
| -rw-r--r-- | packages/Tethering/tests/Android.bp | 1 | ||||
| -rw-r--r-- | packages/Tethering/tests/unit/Android.bp | 1 | ||||
| -rw-r--r-- | services/net/Android.bp | 5 |
7 files changed, 14 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 48f64e65feb0..35879df4b852 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/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 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" + ], } |