Limit build visibility of modules in apex/...

This changes the default visibility of soong modules in this directory
to __subpackages__, from the current public default.

This helps accidental dependencies sneaking in without intent from
the module owner.

Bug: 175604587
Test: m nothing
Change-Id: I1df8b8e087d27f62ce8c09d7e6e32d511efdba6b
This commit is contained in:
Anton Hansson
2020-12-15 18:28:20 +00:00
parent ec0354cc5f
commit c7aa3f18f6
12 changed files with 69 additions and 2 deletions

View File

@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_visibility: [":__subpackages__"],
}
mainline_stubs_args =
"--error UnhiddenSystemApi " +
"--hide BroadcastBehavior " +
@@ -136,6 +140,13 @@ java_defaults {
enabled: true,
sdk_version: "module_current",
},
defaults_visibility: [
":__subpackages__",
"//frameworks/base/libs/hwui",
"//frameworks/base/wifi",
"//packages/modules:__subpackages__",
"//packages/providers/MediaProvider:__subpackages__",
],
}
// Defaults for mainline module system server provided java_sdk_library instances.
@@ -147,6 +158,10 @@ java_defaults {
enabled: true,
sdk_version: "module_current",
},
defaults_visibility: [
":__subpackages__",
"//packages/modules:__subpackages__",
],
}
stubs_defaults {

View File

@@ -19,6 +19,7 @@ filegroup {
"java/**/*.aidl",
],
path: "java",
visibility: ["//frameworks/base"],
}
java_sdk_library {

View File

@@ -28,5 +28,11 @@ java_library {
"libicing",
],
jarjar_rules: "jarjar-rules.txt",
visibility: [
"//frameworks/base/apex/appsearch:__subpackages__",
// These are required until appsearch is properly unbundled.
"//frameworks/base/services/tests/mockingservicestests",
"//frameworks/base/services/tests/servicestests",
],
apex_available: ["com.android.appsearch"],
}

View File

@@ -19,6 +19,7 @@ filegroup {
"java/**/*.aidl"
],
path: "java",
visibility: ["//frameworks/base"],
}
java_library {

View File

@@ -25,4 +25,9 @@ java_library {
"services.core",
"services.usage",
],
visibility: [
// These are required until blobstore is properly unbundled.
"//frameworks/base/services",
"//frameworks/base/services/tests/mockingservicestests",
],
}

View File

@@ -5,6 +5,7 @@ filegroup {
"java/**/*.aidl",
],
path: "java",
visibility: ["//frameworks/base"],
}
java_library {

View File

@@ -23,4 +23,12 @@ java_library {
required: [
"libalarm_jni",
],
visibility: [
"//frameworks/base/apex/jobscheduler:__subpackages__",
// These are required until jobscheduler is properly unbundled.
"//frameworks/base/services",
"//frameworks/base/services/tests/mockingservicestests",
"//frameworks/base/services/tests/servicestests",
"//frameworks/base/tests/JobSchedulerPerfTests",
],
}

View File

@@ -29,8 +29,7 @@ cc_library_shared {
":arctimersrcs",
],
}
}
},
}
filegroup {
@@ -38,4 +37,8 @@ filegroup {
srcs: [
"com_android_server_alarm_AlarmManagerService.cpp",
],
visibility: [
// TODO: remove this
"//vendor:__subpackages__",
],
}

20
apex/media/Android.bp Normal file
View File

@@ -0,0 +1,20 @@
// Copyright (C) 2020 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_visibility: [
":__subpackages__",
"//frameworks/av/apex",
"//frameworks/av/apex/testing",
],
}

View File

@@ -48,6 +48,10 @@ java_library {
"test_com.android.media",
],
min_sdk_version: "29",
visibility: [
"//frameworks/av/apex:__subpackages__",
"//frameworks/base", // For framework-all
],
}
filegroup {
@@ -58,6 +62,7 @@ filegroup {
":mediaparser-srcs",
":mediasession2-java-srcs",
],
visibility: ["//frameworks/base"],
}
filegroup {

View File

@@ -19,6 +19,7 @@ filegroup {
"java/**/*.aidl",
],
path: "java",
visibility: ["//frameworks/base"],
}
java_sdk_library {

View File

@@ -18,6 +18,7 @@ filegroup {
"java/**/*.java",
],
path: "java",
visibility: ["//frameworks/base/services"],
}
java_sdk_library {