Merge "Improve consistency of stubs for framework targets" into rvc-dev (b992b335) · Commits · e / os / android_frameworks_base

Android.bp

+29 −24

Original line number	Original line	Diff line number	Diff line
	@@ -281,17 +281,33 @@ filegroup {
	filegroup {		filegroup {
	name: "framework-updatable-sources",		name: "framework-updatable-sources",
	srcs: [		srcs: [
			":framework-mediaprovider-sources",
			":framework-permission-sources",
	":framework-sdkextensions-sources",		":framework-sdkextensions-sources",
	":framework-statsd-sources",		":framework-statsd-sources",
			":framework-telephony-sources",
	":framework-tethering-srcs",		":framework-tethering-srcs",
	":updatable-media-srcs",
	":framework-mediaprovider-sources",
	":framework-permission-sources",
	":framework-wifi-updatable-sources",		":framework-wifi-updatable-sources",
	":framework-telephony-sources",		":updatable-media-srcs",
	]		]
	}		}

			java_library {
			name: "framework-updatable-stubs-module_libs_api",
			static_libs: [
			"framework-media-stubs-module_libs_api",
			"framework-mediaprovider-stubs-module_libs_api",
			"framework-permission-stubs-module_libs_api",
			"framework-sdkextensions-stubs-module_libs_api",
			"framework-statsd-stubs-module_libs_api",
			"framework-telephony-stubs", // TODO: Update to module_libs_api when there is one.
			"framework-tethering-stubs-module_libs_api",
			"framework-wifi-stubs-module_libs_api",
			],
			sdk_version: "module_current",
			visibility: [":__pkg__"],
			}

	filegroup {		filegroup {
	name: "framework-all-sources",		name: "framework-all-sources",
	srcs: [		srcs: [
	@@ -307,7 +323,6 @@ java_defaults {
	name: "framework-aidl-export-defaults",		name: "framework-aidl-export-defaults",
	aidl: {		aidl: {
	export_include_dirs: [		export_include_dirs: [
	"apex/media/framework/java",
	"core/java",		"core/java",
	"drm/java",		"drm/java",
	"graphics/java",		"graphics/java",
	@@ -324,6 +339,12 @@ java_defaults {
	"rs/java",		"rs/java",
	"sax/java",		"sax/java",
	"telecomm/java",		"telecomm/java",

			// TODO(b/148660295): remove this
			"apex/media/framework/java",

			// TODO(b/147699819): remove this
			"telephony/java",
	],		],
	},		},
	}		}
	@@ -397,9 +418,7 @@ java_defaults {
	"app-compat-annotations",		"app-compat-annotations",
	"ext",		"ext",
	"unsupportedappusage",		"unsupportedappusage",
	"framework-media-stubs-systemapi",		"framework-updatable-stubs-module_libs_api",
	"framework-mediaprovider-stubs-systemapi",
	"framework-telephony-stubs",
	],		],

	jarjar_rules: ":framework-jarjar-rules",		jarjar_rules: ":framework-jarjar-rules",
	@@ -465,13 +484,6 @@ java_library {
	name: "framework-minus-apex",		name: "framework-minus-apex",
	defaults: ["framework-defaults"],		defaults: ["framework-defaults"],
	srcs: [":framework-non-updatable-sources"],		srcs: [":framework-non-updatable-sources"],
	libs: [
	"framework-sdkextensions-stubs-systemapi",
	"framework-statsd-stubs-module_libs_api",
	"framework-permission-stubs-systemapi",
	"framework-wifi-stubs-systemapi",
	"framework-tethering-stubs-module_libs_api",
	],
	installable: true,		installable: true,
	javac_shard_size: 150,		javac_shard_size: 150,
	required: [		required: [
	@@ -512,16 +524,9 @@ java_library {
	installable: false, // this lib is a build-only library		installable: false, // this lib is a build-only library
	static_libs: [		static_libs: [
	"framework-minus-apex",		"framework-minus-apex",
	"framework-media-stubs-systemapi",		// TODO (b/147688669) should be removed
	"framework-mediaprovider-stubs-systemapi",
	"framework-permission-stubs-systemapi",
	"framework-sdkextensions-stubs-systemapi",
	"framework-statsd-stubs-module_libs_api",
	"framework-wifi-stubs-systemapi",
	"framework-tethering-stubs-module_libs_api",
	// TODO (b/147688669) should be framework-telephony-stubs
	"framework-telephony",		"framework-telephony",
	// TODO(jiyong): add stubs for APEXes here		"framework-updatable-stubs-module_libs_api",
	],		],
	sdk_version: "core_platform",		sdk_version: "core_platform",
	apex_available: ["//apex_available:platform"],		apex_available: ["//apex_available:platform"],