Merge "Revert "Change the default docs build to use module stubs"" am: 56e85bb8c0 (d23ac265) · Commits · e / os / android_frameworks_base

ApiDocs.bp

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -112,6 +112,7 @@ stubs_defaults {
	}		}

	// Defaults module for doc-stubs targets that use module source code as input.		// Defaults module for doc-stubs targets that use module source code as input.
			// This is the default/normal.
	stubs_defaults {		stubs_defaults {
	name: "framework-doc-stubs-sources-default",		name: "framework-doc-stubs-sources-default",
	defaults: ["framework-doc-stubs-default"],		defaults: ["framework-doc-stubs-default"],
	@@ -145,6 +146,12 @@ droidstubs {
	" --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ",		" --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ",
	}		}

			droidstubs {
			name: "framework-doc-stubs",
			defaults: ["framework-doc-stubs-sources-default"],
			args: metalava_framework_docs_args,
			}

	droidstubs {		droidstubs {
	name: "framework-doc-system-stubs",		name: "framework-doc-system-stubs",
	defaults: ["framework-doc-stubs-sources-default"],		defaults: ["framework-doc-stubs-sources-default"],
	@@ -153,8 +160,11 @@ droidstubs {
	api_levels_sdk_type: "system",		api_levels_sdk_type: "system",
	}		}

			// Experimental target building doc stubs with module stub source code as input.
			// This is intended to eventually replace framework-doc-stubs, once all diffs
			// have been eliminated.
	droidstubs {		droidstubs {
	name: "framework-doc-stubs",		name: "framework-doc-stubs-module-stubs",
	defaults: ["framework-doc-stubs-default"],		defaults: ["framework-doc-stubs-default"],
	args: metalava_framework_docs_args,		args: metalava_framework_docs_args,
	srcs: [		srcs: [