Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Simplify module visibility post build refactor" into stage-aosp-master am: 1d35b7bc24 am: 0dc6f2375d am: 476209a6c6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513172

Change-Id: I8934625a2356f7cf7769d8685e0c8e08a22be292
This commit is contained in:
Anton Hansson
2020-09-07 09:16:39 +00:00
committed by Automerger Merge Worker
parent c3cc9152fc 476209a6c6
commit 6bb68d7b16
6 changed files with 6 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apex/media/framework/Android.bp
View File

@@ -44,7 +44,6 @@ java_library {
plugins: ["java_api_finder"], plugins: ["java_api_finder"],
hostdex: true, // for hiddenapi check hostdex: true, // for hiddenapi check
visibility: ["//frameworks/av/apex:__subpackages__"],
apex_available: [ apex_available: [
"com.android.media", "com.android.media",
"test_com.android.media", "test_com.android.media",
@@ -83,7 +82,7 @@ filegroup {
"java/android/media/MediaParser.java" "java/android/media/MediaParser.java"
], ],
path: "java", path: "java",
} }
java_sdk_library { java_sdk_library {
name: "framework-media", name: "framework-media",
@@ -99,15 +98,7 @@ java_sdk_library {
libs: [ libs: [
"framework_media_annotation", "framework_media_annotation",
], ],
impl_library_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__",
],
} }

8
apex/permission/framework/Android.bp
View File

@@ -25,14 +25,8 @@ java_sdk_library {
name: "framework-permission", name: "framework-permission",
defaults: ["framework-module-defaults"], defaults: ["framework-module-defaults"],
// Allow access to the stubs from anywhere.
visibility: ["//visibility:public"],
// Restrict access to implementation library. // Restrict access to implementation library.
impl_library_visibility: [ impl_library_visibility: ["//frameworks/base/apex/permission:__subpackages__"],
"//visibility:override", // Ignore the visibility property.
"//frameworks/base/apex/permission:__subpackages__",
],
srcs: [ srcs: [
":framework-permission-sources", ":framework-permission-sources",

8
apex/permission/service/Android.bp
View File

@@ -23,15 +23,7 @@ filegroup {
java_sdk_library { java_sdk_library {
name: "service-permission", name: "service-permission",
defaults: ["framework-system-server-module-defaults"], defaults: ["framework-system-server-module-defaults"],
visibility: [
"//frameworks/base/services/core",
"//frameworks/base/apex/permission",
"//frameworks/base/apex/permission/testing",
"//frameworks/base/apex/permission/tests",
"//frameworks/base/services/tests/mockingservicestests",
],
impl_library_visibility: [ impl_library_visibility: [
"//visibility:override",
"//frameworks/base/apex/permission/tests", "//frameworks/base/apex/permission/tests",
"//frameworks/base/services/tests/mockingservicestests", "//frameworks/base/services/tests/mockingservicestests",
"//frameworks/base/services/tests/servicestests", "//frameworks/base/services/tests/servicestests",

14
apex/statsd/framework/Android.bp
View File

@@ -72,19 +72,7 @@ java_sdk_library {
hostdex: true, // for hiddenapi check hostdex: true, // for hiddenapi check
visibility: [ impl_library_visibility: ["//frameworks/base/apex/statsd/framework/test:__subpackages__"],
"//frameworks/base", // Framework
"//frameworks/base/apex/statsd:__subpackages__", // statsd apex
"//frameworks/base/packages/Tethering", // Tethering
"//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: [ apex_available: [
"com.android.os.statsd", "com.android.os.statsd",

14
packages/Tethering/common/TetheringLib/Android.bp
View File

@@ -16,19 +16,9 @@
java_sdk_library { java_sdk_library {
name: "framework-tethering", name: "framework-tethering",
defaults: ["framework-module-defaults"], defaults: ["framework-module-defaults"],
impl_library_visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],
// Allow access to the stubs from anywhere. srcs: [":framework-tethering-srcs"],
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",
],
jarjar_rules: "jarjar-rules.txt", jarjar_rules: "jarjar-rules.txt",
installable: true, installable: true,

4
wifi/Android.bp
View File

@@ -130,12 +130,8 @@ java_sdk_library {
}, },
hostdex: true, // for hiddenapi check hostdex: true, // for hiddenapi check
// Allow access to the stubs from anywhere.
visibility: ["//visibility:public"],
// Restrict access to implementation library. // Restrict access to implementation library.
impl_library_visibility: [ impl_library_visibility: [
"//visibility:override", // Ignore the visibility property.
"//frameworks/opt/net/wifi/service:__subpackages__", "//frameworks/opt/net/wifi/service:__subpackages__",
] + test_access_hidden_api_whitelist, ] + test_access_hidden_api_whitelist,