Use filegroup defaults for framework sources

There's now a shared defaults module for this kind of filegroup. Use
that and remove the previously duplicated prop.

Bug: 271816210
Test: m
Change-Id: Ia4547984a73179fdfc98c427482dd10246f9722c

Former-commit-id: 57f3d69fd5
This commit is contained in:
Anton Hansson 2023-03-15 10:30:10 +00:00
parent 40d09d09b8
commit bff5ebc322
4 changed files with 7 additions and 10 deletions

View File

@ -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",

View File

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

View File

@ -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: [
"//frameworks/base",
"//packages/modules/Connectivity:__subpackages__",
],
visibility: ["//packages/modules/Connectivity:__subpackages__"],
}
java_defaults {

View File

@ -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