Merge "Add previously released APIs to android-non-updatable-doc-stubs*" into main (157936c2) · Commits · e / os / android_frameworks_base

api/ApiDocs.bp

+63 −4

Original line number	Diff line number	Diff line
		@@ -87,6 +87,16 @@ droidstubs {
		"android-non-updatable-doc-stubs-defaults",
		"module-classpath-stubs-defaults",
		],

		// Use the compatibility check properties to supply the previously released API to which
		// flagged APIs can be reverted but disable the compatibility check as it is not required.
		check_api: {
		last_released: {
		enabled: false,
		api_file: ":android-non-updatable.api.combined.public.latest",
		removed_api_file: ":android-non-updatable-removed.api.combined.public.latest",
		},
		},
		}

		droidstubs {
		@@ -96,6 +106,16 @@ droidstubs {
		"module-classpath-stubs-defaults",
		],
		flags: ["--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)"],

		// Use the compatibility check properties to supply the previously released API to which
		// flagged APIs can be reverted but disable the compatibility check as it is not required.
		check_api: {
		last_released: {
		enabled: false,
		api_file: ":android-non-updatable.api.combined.system.latest",
		removed_api_file: ":android-non-updatable-removed.api.combined.system.latest",
		},
		},
		}

		droidstubs {
		@@ -108,10 +128,41 @@ droidstubs {
		"--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\\)",
		"--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)",
		],

		// Use the compatibility check properties to supply the previously released API to which
		// flagged APIs can be reverted but disable the compatibility check as it is not required.
		check_api: {
		last_released: {
		enabled: false,
		api_file: ":android-non-updatable.api.combined.module-lib.latest",
		removed_api_file: ":android-non-updatable-removed.api.combined.module-lib.latest",
		},
		},
		generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs.
		write_sdk_values: false,
		}

		// Filegroups consisting of all the files that contribute to the previously released
		// module-lib API plus the previously released system-server API. These are needed as the
		// `system-server` API surface only extends public but the
		// `android-non-updatable-doc-stubs-system-server` module includes module-lib APIs
		// too.
		filegroup {
		name: "android-non-updatable.api.system-server-plus-module-lib.latest",
		srcs: [
		":android-non-updatable.api.combined.module-lib.latest",
		":android-non-updatable.api.system-server.latest",
		],
		}

		filegroup {
		name: "android-non-updatable-removed.api.system-server-plus-module-lib.latest",
		srcs: [
		":android-non-updatable-removed.api.combined.module-lib.latest",
		":android-non-updatable-removed.api.system-server.latest",
		],
		}

		droidstubs {
		name: "android-non-updatable-doc-stubs-system-server",
		defaults: [
		@@ -123,6 +174,16 @@ droidstubs {
		"--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)",
		"--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)",
		],

		// Use the compatibility check properties to supply the previously released API to which
		// flagged APIs can be reverted but disable the compatibility check as it is not required.
		check_api: {
		last_released: {
		enabled: false,
		api_file: ":android-non-updatable.api.system-server-plus-module-lib.latest",
		removed_api_file: ":android-non-updatable-removed.api.system-server-plus-module-lib.latest",
		},
		},
		generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs.
		write_sdk_values: false,
		}
		@@ -140,8 +201,7 @@ droidstubs {
		},

		// Use the compatibility check properties to supply the previously released API to which
		// flagged APIs can be reverted. However, the compatibility check is disabled as it is
		// not required.
		// flagged APIs can be reverted but disable the compatibility check as it is not required.
		check_api: {
		last_released: {
		enabled: false,
		@@ -160,8 +220,7 @@ droidstubs {
		api_levels_module: "api_versions_system",

		// Use the compatibility check properties to supply the previously released API to which
		// flagged APIs can be reverted. However, the compatibility check is disabled as it is
		// not required.
		// flagged APIs can be reverted but disable the compatibility check as it is not required.
		check_api: {
		last_released: {
		enabled: false,