Merge "Split android-non-updatable-stubs-defaults in two" am: 70ab0685cf am:... (7312a200) · Commits · e / os / android_frameworks_base

Android.bp

+27 −11

Original line number	Diff line number	Diff line
		@@ -506,7 +506,9 @@ filegroup {
		visibility: ["//visibility:private"],
		}

		// These defaults are used for both the jar stubs and the doc stubs.
		// Defaults for all stubs that include the non-updatable framework. These defaults do not include
		// module symbols, so will not compile correctly on their own. Users must add module APIs to the
		// classpath (or sources) somehow.
		stubs_defaults {
		name: "android-non-updatable-stubs-defaults",
		srcs: [":android-non-updatable-stub-sources"],
		@@ -514,17 +516,14 @@ stubs_defaults {
		system_modules: "none",
		java_version: "1.8",
		arg_files: ["core/res/AndroidManifest.xml"],
		// TODO(b/147699819): remove below aidl includes.
		aidl: {
		local_include_dirs: [
		"apex/media/aidl/stable",
		"media/aidl",
		"telephony/java",
		],
		include_dirs: [
		"frameworks/av/aidl",
		"frameworks/native/libs/permission/aidl",
		"packages/modules/Connectivity/framework/aidl-export",
		],
		},
		// These are libs from framework-internal-utils that are required (i.e. being referenced)
		@@ -546,6 +545,30 @@ stubs_defaults {
		"android.hardware.usb.gadget-V1.0-java",
		"android.hardware.vibrator-V1.3-java",
		"framework-protos",
		],
		filter_packages: packages_to_document,
		high_mem: true, // Lots of sources => high memory use, see b/170701554
		installable: false,
		annotations_enabled: true,
		previous_api: ":android.api.public.latest",
		merge_annotations_dirs: ["metalava-manual"],
		defaults_visibility: ["//visibility:private"],
		visibility: ["//frameworks/base/api"],
		}

		// Defaults with module APIs in the classpath (mostly from prebuilts).
		// Suitable for compiling android-non-updatable.
		stubs_defaults {
		name: "module-classpath-stubs-defaults",
		aidl: {
		local_include_dirs: [
		"apex/media/aidl/stable",
		],
		include_dirs: [
		"packages/modules/Connectivity/framework/aidl-export",
		],
		},
		libs: [
		"art.module.public.api",
		"sdk_module-lib_current_framework-tethering",
		// There are a few classes from modules used by the core that
		@@ -556,14 +579,7 @@ stubs_defaults {
		// NOTE: The below can be removed once the prebuilt stub contains IKE.
		"sdk_system_current_android.net.ipsec.ike",
		],
		filter_packages: packages_to_document,
		high_mem: true, // Lots of sources => high memory use, see b/170701554
		installable: false,
		annotations_enabled: true,
		previous_api: ":android.api.public.latest",
		merge_annotations_dirs: ["metalava-manual"],
		defaults_visibility: ["//visibility:private"],
		visibility: ["//frameworks/base/api"],
		}

		build = [

ApiDocs.bp

+4 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,10 @@ framework_docs_only_libs = [

		stubs_defaults {
		name: "android-non-updatable-doc-stubs-defaults",
		defaults: ["android-non-updatable-stubs-defaults"],
		defaults: [
		"android-non-updatable-stubs-defaults",
		"module-classpath-stubs-defaults",
		],
		srcs: [
		// No longer part of the stubs, but are included in the docs.
		":android-test-base-sources",

StubLibraries.bp

+16 −4

Original line number	Diff line number	Diff line
		@@ -29,7 +29,10 @@

		droidstubs {
		name: "api-stubs-docs-non-updatable",
		defaults: ["android-non-updatable-stubs-defaults"],
		defaults: [
		"android-non-updatable-stubs-defaults",
		"module-classpath-stubs-defaults",
		],
		args: metalava_framework_docs_args,
		check_api: {
		current: {
		@@ -78,7 +81,10 @@ module_libs = " --show-annotation android.annotation.SystemApi\\(" +

		droidstubs {
		name: "system-api-stubs-docs-non-updatable",
		defaults: ["android-non-updatable-stubs-defaults"],
		defaults: [
		"android-non-updatable-stubs-defaults",
		"module-classpath-stubs-defaults",
		],
		args: metalava_framework_docs_args + priv_apps,
		check_api: {
		current: {
		@@ -114,7 +120,10 @@ droidstubs {

		droidstubs {
		name: "test-api-stubs-docs-non-updatable",
		defaults: ["android-non-updatable-stubs-defaults"],
		defaults: [
		"android-non-updatable-stubs-defaults",
		"module-classpath-stubs-defaults",
		],
		args: metalava_framework_docs_args + test + priv_apps_in_stubs,
		check_api: {
		current: {
		@@ -156,7 +165,10 @@ droidstubs {

		droidstubs {
		name: "module-lib-api-stubs-docs-non-updatable",
		defaults: ["android-non-updatable-stubs-defaults"],
		defaults: [
		"android-non-updatable-stubs-defaults",
		"module-classpath-stubs-defaults",
		],
		args: metalava_framework_docs_args + priv_apps_in_stubs + module_libs,
		check_api: {
		current: {