Merge "Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions" into main (45e63e8f) · Commits · e / os / android_frameworks_base

api/Android.bp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -231,7 +231,7 @@ genrule {
	name: "sdk-annotations.zip",		name: "sdk-annotations.zip",
	defaults: ["sdk-annotations-defaults"],		defaults: ["sdk-annotations-defaults"],
	srcs: [		srcs: [
	":android-non-updatable-doc-stubs{.annotations.zip}",		":android-non-updatable-doc-stubs{.exportable.annotations.zip}",
	":all-modules-public-annotations",		":all-modules-public-annotations",
	],		],
	}		}
	@@ -240,7 +240,7 @@ genrule {
	name: "sdk-annotations-system.zip",		name: "sdk-annotations-system.zip",
	defaults: ["sdk-annotations-defaults"],		defaults: ["sdk-annotations-defaults"],
	srcs: [		srcs: [
	":android-non-updatable-doc-stubs-system{.annotations.zip}",		":android-non-updatable-doc-stubs-system{.exportable.annotations.zip}",
	":all-modules-system-annotations",		":all-modules-system-annotations",
	],		],
	}		}
	@@ -249,7 +249,7 @@ genrule {
	name: "sdk-annotations-module-lib.zip",		name: "sdk-annotations-module-lib.zip",
	defaults: ["sdk-annotations-defaults"],		defaults: ["sdk-annotations-defaults"],
	srcs: [		srcs: [
	":android-non-updatable-doc-stubs-module-lib{.annotations.zip}",		":android-non-updatable-doc-stubs-module-lib{.exportable.annotations.zip}",
	":all-modules-module-lib-annotations",		":all-modules-module-lib-annotations",
	],		],
	}		}
	@@ -258,7 +258,7 @@ genrule {
	name: "sdk-annotations-system-server.zip",		name: "sdk-annotations-system-server.zip",
	defaults: ["sdk-annotations-defaults"],		defaults: ["sdk-annotations-defaults"],
	srcs: [		srcs: [
	":android-non-updatable-doc-stubs-system-server{.annotations.zip}",		":android-non-updatable-doc-stubs-system-server{.exportable.annotations.zip}",
	":all-modules-system-server-annotations",		":all-modules-system-server-annotations",
	],		],
	}		}

api/ApiDocs.bp

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -208,7 +208,7 @@ droiddoc {
	name: "offline-sdk-docs",		name: "offline-sdk-docs",
	defaults: ["framework-docs-default"],		defaults: ["framework-docs-default"],
	srcs: [		srcs: [
	":framework-doc-stubs",		":framework-doc-stubs{.exportable}",
	],		],
	hdf: [		hdf: [
	"android.whichdoc offline",		"android.whichdoc offline",
	@@ -229,7 +229,7 @@ droiddoc {
	name: "offline-sdk-referenceonly-docs",		name: "offline-sdk-referenceonly-docs",
	defaults: ["framework-docs-default"],		defaults: ["framework-docs-default"],
	srcs: [		srcs: [
	":framework-doc-stubs",		":framework-doc-stubs{.exportable}",
	],		],
	hdf: [		hdf: [
	"android.whichdoc offline",		"android.whichdoc offline",
	@@ -273,7 +273,7 @@ droiddoc {
	name: "ds-docs-java",		name: "ds-docs-java",
	defaults: ["framework-docs-default"],		defaults: ["framework-docs-default"],
	srcs: [		srcs: [
	":framework-doc-stubs",		":framework-doc-stubs{.exportable}",
	],		],
	hdf: [		hdf: [
	"android.whichdoc online",		"android.whichdoc online",
	@@ -307,7 +307,7 @@ droiddoc {
	droiddoc {		droiddoc {
	name: "ds-docs-kt",		name: "ds-docs-kt",
	srcs: [		srcs: [
	":framework-doc-stubs",		":framework-doc-stubs{.exportable}",
	],		],
	flags: [		flags: [
	"-noJdkLink",		"-noJdkLink",
	@@ -361,7 +361,7 @@ droiddoc {
	name: "ds-static-docs",		name: "ds-static-docs",
	defaults: ["framework-docs-default"],		defaults: ["framework-docs-default"],
	srcs: [		srcs: [
	":framework-doc-stubs",		":framework-doc-stubs{.exportable}",
	],		],
	hdf: [		hdf: [
	"android.whichdoc online",		"android.whichdoc online",
	@@ -378,7 +378,7 @@ droiddoc {
	name: "ds-ref-navtree-docs",		name: "ds-ref-navtree-docs",
	defaults: ["framework-docs-default"],		defaults: ["framework-docs-default"],
	srcs: [		srcs: [
	":framework-doc-stubs",		":framework-doc-stubs{.exportable}",
	],		],
	hdf: [		hdf: [
	"android.whichdoc online",		"android.whichdoc online",

api/StubLibraries.bp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -961,7 +961,7 @@ java_api_library {
	java_library {		java_library {
	name: "android_stubs_current_with_test_libs",		name: "android_stubs_current_with_test_libs",
	static_libs: [		static_libs: [
	"android_stubs_current",		"android_stubs_current_exportable",
	"android.test.base.stubs",		"android.test.base.stubs",
	"android.test.mock.stubs",		"android.test.mock.stubs",
	"android.test.runner.stubs",		"android.test.runner.stubs",
	@@ -976,7 +976,7 @@ java_library {
	java_library {		java_library {
	name: "android_system_stubs_current_with_test_libs",		name: "android_system_stubs_current_with_test_libs",
	static_libs: [		static_libs: [
	"android_system_stubs_current",		"android_system_stubs_current_exportable",
	"android.test.base.stubs.system",		"android.test.base.stubs.system",
	"android.test.mock.stubs.system",		"android.test.mock.stubs.system",
	"android.test.runner.stubs.system",		"android.test.runner.stubs.system",
	@@ -991,7 +991,7 @@ java_library {
	java_library {		java_library {
	name: "android_module_stubs_current_with_test_libs",		name: "android_module_stubs_current_with_test_libs",
	static_libs: [		static_libs: [
	"android_module_lib_stubs_current",		"android_module_lib_stubs_current_exportable",
	"android.test.base.stubs",		"android.test.base.stubs",
	"android.test.mock.stubs",		"android.test.mock.stubs",
	"android.test.runner.stubs",		"android.test.runner.stubs",
	@@ -1006,7 +1006,7 @@ java_library {
	java_library {		java_library {
	name: "android_system_server_stubs_current_with_test_libs",		name: "android_system_server_stubs_current_with_test_libs",
	static_libs: [		static_libs: [
	"android_system_server_stubs_current",		"android_system_server_stubs_current_exportable",
	"android.test.base.stubs.system",		"android.test.base.stubs.system",
	"android.test.mock.stubs.system",		"android.test.mock.stubs.system",
	"android.test.runner.stubs.system",		"android.test.runner.stubs.system",