Clean up the visibility rules for framework modules

Switching from java_library to java_sdk_library switched the meaning
of the module name from referring to the implementation library to
referring to the stubs. This change updates the visibility rules to
reflect that new meaning.

Visibility rules that were previously set for the java_library have
been moved to the impl_library_visibility property and the special
//visibility:override value has been prepended to prevent it from
inheriting the values from the visibility property.

Visibility rules set for the stubs (via stubs_library_visibility)
property have been moved to the visibility property.

Bug: 155164730
Test: m nothing
Exempt-From-Owner-Approval: Build cleanup
Change-Id: Icc9bc5a9ef86cf7ba0f15c2b2a4abd596ec9f640

5 files changed, 45 insertions, 13 deletions

diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index 4d6ac7281988..ac501a510e80 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -105,7 +105,14 @@ java_sdk_library {
         "framework_media_annotation",
     ],
 
-    visibility: ["//frameworks/av/apex:__subpackages__"],
+    // Allow access to the stubs from anywhere.
+    visibility: ["//visibility:public"],
+
+    // Restrict access to implementation library.
+    impl_library_visibility: [
+       "//visibility:override", // Ignore the visibility property.
+       "//frameworks/av/apex:__subpackages__",
+    ],
 }
 
 
diff --git a/apex/permission/framework/Android.bp b/apex/permission/framework/Android.bp
index c43fabde81da..732caecbd4a7 100644
--- a/apex/permission/framework/Android.bp
+++ b/apex/permission/framework/Android.bp
@@ -24,6 +24,16 @@ filegroup {
 java_sdk_library {
     name: "framework-permission",
     defaults: ["framework-module-defaults"],
+
+    // Allow access to the stubs from anywhere.
+    visibility: ["//visibility:public"],
+
+    // Restrict access to implementation library.
+    impl_library_visibility: [
+        "//visibility:override", // Ignore the visibility property.
+        "//frameworks/base/apex/permission:__subpackages__",
+    ],
+
     srcs: [
         ":framework-permission-sources",
     ],
@@ -43,8 +53,4 @@ java_sdk_library {
     ],
     hostdex: true,
     installable: true,
-    visibility: [
-        "//frameworks/base/apex/permission:__subpackages__",
-    ],
-    stubs_library_visibility: ["//visibility:public"],
 }
diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index 27bd2e31168d..78496c4074f8 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -75,15 +75,20 @@ java_sdk_library {
     ],
 
     hostdex: true, // for hiddenapi check
+
     visibility: [
-        "//frameworks/base/apex/statsd:__subpackages__",
-    ],
-    stubs_library_visibility: [
         "//frameworks/base", // Framework
-        "//frameworks/base/apex/statsd", // statsd apex
+        "//frameworks/base/apex/statsd:__subpackages__", // statsd apex
         "//frameworks/opt/net/wifi/service", // wifi service
         "//packages/providers/MediaProvider", // MediaProvider apk
     ],
+
+    // Restrict access to implementation library.
+    impl_library_visibility: [
+        "//visibility:override", // Ignore the visibility property.
+        "//frameworks/base/apex/statsd:__subpackages__", // statsd apex
+    ],
+
     apex_available: [
         "com.android.os.statsd",
         "test_com.android.os.statsd",
diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp
index 408725c8658b..6c05b11258f0 100644
--- a/packages/Tethering/common/TetheringLib/Android.bp
+++ b/packages/Tethering/common/TetheringLib/Android.bp
@@ -16,6 +16,16 @@
 java_sdk_library {
     name: "framework-tethering",
     defaults: ["framework-module-defaults"],
+
+    // Allow access to the stubs from anywhere.
+    visibility: ["//visibility:public"],
+
+    // Restrict access to implementation library.
+    impl_library_visibility: [
+        "//visibility:override", // Ignore the visibility property.
+        "//frameworks/base/packages/Tethering:__subpackages__",
+    ],
+
     srcs: [
         ":framework-tethering-srcs",
     ],
@@ -29,8 +39,6 @@ java_sdk_library {
     installable: true,
 
     hostdex: true, // for hiddenapi check
-    visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],
-    stubs_library_visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     permitted_packages: ["android.net"],
 }
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 63c14e9350cb..0df578f2216b 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -123,10 +123,16 @@ java_sdk_library {
         enabled: false
     },
     hostdex: true, // for hiddenapi check
-    visibility: [
+
+    // Allow access to the stubs from anywhere.
+    visibility: ["//visibility:public"],
+
+    // Restrict access to implementation library.
+    impl_library_visibility: [
+        "//visibility:override", // Ignore the visibility property.
         "//frameworks/opt/net/wifi/service:__subpackages__",
     ] + test_access_hidden_api_whitelist,
-    stubs_library_visibility: ["//visibility:public"],
+
     apex_available: [
         "com.android.wifi",
         "test_com.android.wifi",