Merge "Remove unused API defaults" am: d0006466a5 am: b88133cd87 (ca4b8eb7) · Commits · e / os / android_frameworks_base

apex/Android.bp

+0 −135

Original line number	Diff line number	Diff line
		@@ -146,141 +146,6 @@ java_defaults {
		},
		}

		stubs_defaults {
		name: "framework-module-stubs-defaults-publicapi",
		args: mainline_framework_stubs_args,
		installable: false,
		sdk_version: "module_current",
		annotations_enabled: true,
		merge_annotations_dirs: [
		"metalava-manual",
		],
		filter_packages: framework_packages_to_document,
		check_api: {
		current: {
		api_file: "api/current.txt",
		removed_api_file: "api/removed.txt",
		},
		api_lint: {
		enabled: true,
		},
		},
		dist: {
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/public/api",
		},
		}

		stubs_defaults {
		name: "framework-module-stubs-defaults-systemapi",
		args: mainline_framework_stubs_args + priv_apps,
		libs: ["framework-annotations-lib"],
		installable: false,
		sdk_version: "module_current",
		annotations_enabled: true,
		merge_annotations_dirs: [
		"metalava-manual",
		],
		filter_packages: framework_packages_to_document,
		check_api: {
		current: {
		api_file: "api/system-current.txt",
		removed_api_file: "api/system-removed.txt",
		},
		api_lint: {
		enabled: true,
		},
		},
		dist: {
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system/api",
		},
		}

		java_defaults {
		name: "framework-module-stubs-lib-defaults-publicapi",
		installable: false,
		sdk_version: "module_current",
		libs: [ "stub-annotations" ],
		java_version: "1.8",
		dist: {
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/public",
		},
		}

		java_defaults {
		name: "framework-module-stubs-lib-defaults-systemapi",
		installable: false,
		sdk_version: "module_current",
		libs: [ "stub-annotations" ],
		java_version: "1.8",
		dist: {
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system",
		},
		}

		java_defaults {
		name: "framework-module-stubs-lib-defaults-module_libs_api",
		installable: false,
		sdk_version: "module_current",
		libs: [ "stub-annotations" ],
		java_version: "1.8",
		dist: {
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/module-lib",
		},
		}

		// The defaults for module_libs comes in two parts - defaults for API checks
		// and defaults for stub generation. This is because we want the API txt
		// files to only include the module_libs_api, but the stubs to include
		// module_libs_api as well as priv_apps.

		stubs_defaults {
		name: "framework-module-api-defaults-module_libs_api",
		args: mainline_framework_stubs_args + module_libs,
		libs: ["framework-annotations-lib"],
		installable: false,
		sdk_version: "module_current",
		annotations_enabled: true,
		merge_annotations_dirs: [
		"metalava-manual",
		],
		filter_packages: framework_packages_to_document,

		// Do not generate stubs as they are not needed
		generate_stubs: false,

		check_api: {
		current: {
		api_file: "api/module-lib-current.txt",
		removed_api_file: "api/module-lib-removed.txt",
		},
		api_lint: {
		enabled: true,
		},
		},
		dist: {
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/module-lib/api",
		},
		}

		stubs_defaults {
		name: "framework-module-stubs-defaults-module_libs_api",
		args: mainline_framework_stubs_args + module_libs + priv_apps,
		libs: ["framework-annotations-lib"],
		installable: false,
		sdk_version: "module_current",
		annotations_enabled: true,
		merge_annotations_dirs: [
		"metalava-manual",
		],
		filter_packages: framework_packages_to_document,
		}

		stubs_defaults {
		name: "service-module-stubs-srcs-defaults",
		args: mainline_service_stubs_args,