Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 (6311b95c) · Commits · e / os / android_frameworks_base

apex/media/framework/Android.bp

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,14 @@ java_sdk_library {
	"framework_media_annotation",		"framework_media_annotation",
	],		],

	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__",
			],
	}		}

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,16 @@ filegroup {
	java_sdk_library {		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.
			impl_library_visibility: [
			"//visibility:override", // Ignore the visibility property.
			"//frameworks/base/apex/permission:__subpackages__",
			],

	srcs: [		srcs: [
	":framework-permission-sources",		":framework-permission-sources",
	],		],
	@@ -43,8 +53,4 @@ java_sdk_library {
	],		],
	hostdex: true,		hostdex: true,
	installable: true,		installable: true,
	visibility: [
	"//frameworks/base/apex/permission:__subpackages__",
	],
	stubs_library_visibility: ["//visibility:public"],
	}		}

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -75,15 +75,20 @@ java_sdk_library {
	],		],

	hostdex: true, // for hiddenapi check		hostdex: true, // for hiddenapi check

	visibility: [		visibility: [
	"//frameworks/base/apex/statsd:__subpackages__",
	],
	stubs_library_visibility: [
	"//frameworks/base", // Framework		"//frameworks/base", // Framework
	"//frameworks/base/apex/statsd", // statsd apex		"//frameworks/base/apex/statsd:__subpackages__", // statsd apex
	"//frameworks/opt/net/wifi/service", // wifi service		"//frameworks/opt/net/wifi/service", // wifi service
	"//packages/providers/MediaProvider", // MediaProvider apk		"//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",
	"test_com.android.os.statsd",		"test_com.android.os.statsd",

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,16 @@
	java_sdk_library {		java_sdk_library {
	name: "framework-tethering",		name: "framework-tethering",
	defaults: ["framework-module-defaults"],		defaults: ["framework-module-defaults"],

			// 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/base/packages/Tethering:__subpackages__",
			],

	srcs: [		srcs: [
	":framework-tethering-srcs",		":framework-tethering-srcs",
	],		],
	@@ -29,8 +39,6 @@ java_sdk_library {
	installable: true,		installable: true,

	hostdex: true, // for hiddenapi check		hostdex: true, // for hiddenapi check
	visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],
	stubs_library_visibility: ["//visibility:public"],
	apex_available: ["com.android.tethering"],		apex_available: ["com.android.tethering"],
	permitted_packages: ["android.net"],		permitted_packages: ["android.net"],
	}		}

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -123,10 +123,16 @@ java_sdk_library {
	enabled: false		enabled: false
	},		},
	hostdex: true, // for hiddenapi check		hostdex: true, // for hiddenapi check
	visibility: [
			// 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/opt/net/wifi/service:__subpackages__",		"//frameworks/opt/net/wifi/service:__subpackages__",
	] + test_access_hidden_api_whitelist,		] + test_access_hidden_api_whitelist,
	stubs_library_visibility: ["//visibility:public"],
	apex_available: [		apex_available: [
	"com.android.wifi",		"com.android.wifi",
	"test_com.android.wifi",		"test_com.android.wifi",