Merge "Simplify module visibility post build refactor" into stage-aosp-master (1d35b7bc) · Commits · e / os / android_frameworks_base

apex/media/framework/Android.bp

+2 −11

Original line number	Original line	Diff line number	Diff line
	@@ -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",
	@@ -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__",
	],
	}		}

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -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",

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -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",

+1 −13

Original line number	Original line	Diff line number	Diff line
	@@ -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",

+2 −12

Original line number	Original line	Diff line number	Diff line
	@@ -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,