Merge "Use filegroup defaults for framework sources"

Tethering/common/TetheringLib/Android.bp

@@ -127,7 +127,7 @@ java_genrule {
     out: ["framework_tethering_jarjar_rules.txt"],
     cmd: "$(location jarjar-rules-generator) " +
         "$(location :framework-tethering-pre-jarjar{.jar}) " +
-        "--apistubs $(location :framework-tethering.stubs.module_lib{.jar}) " + 
+        "--apistubs $(location :framework-tethering.stubs.module_lib{.jar}) " +
         "--prefix android.net.http.internal " +
         "--excludes $(location jarjar-excludes.txt) " +
         "--output $(out)",
@@ -151,6 +151,7 @@ java_defaults {
 
 filegroup {
     name: "framework-tethering-srcs",
+    defaults: ["framework-sources-module-defaults"],
     srcs: [
         "src/**/*.aidl",
         "src/**/*.java",

framework-t/Sources.bp

@@ -16,15 +16,13 @@
 
 filegroup {
     name: "framework-connectivity-tiramisu-updatable-sources",
+    defaults: ["framework-sources-module-defaults"],
     srcs: [
         "src/**/*.java",
         "src/**/*.aidl",
     ],
     path: "src",
-    visibility: [
+    visibility: ["//packages/modules/Connectivity:__subpackages__"],
-        "//frameworks/base",
-        "//packages/modules/Connectivity:__subpackages__",
-    ],
 }
 
 cc_library_shared {

framework/Android.bp

@@ -45,14 +45,12 @@ filegroup {
 // TODO: use a java_library in the bootclasspath instead
 filegroup {
     name: "framework-connectivity-sources",
+    defaults: ["framework-sources-module-defaults"],
     srcs: [
         ":framework-connectivity-internal-sources",
         ":framework-connectivity-aidl-export-sources",
     ],
-    visibility: [
+    visibility: ["//packages/modules/Connectivity:__subpackages__"],
-        "//frameworks/base",
-        "//packages/modules/Connectivity:__subpackages__",
-    ],
 }
 
 java_defaults {

nearby/framework/Android.bp

@@ -32,10 +32,10 @@ filegroup {
 
 filegroup {
     name: "framework-nearby-sources",
+    defaults: ["framework-sources-module-defaults"],
     srcs: [
         ":framework-nearby-java-sources",
     ],
-    visibility: ["//frameworks/base"],
 }
 
 // Build of only framework-nearby (not as part of connectivity) for