Merge "Merge "Re-submit "Change the default docs build to use module stubs""... (809adc7c) · Commits · e / os / android_frameworks_base

ApiDocs.bp

+1 −11

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

		// Defaults module for doc-stubs targets that use module source code as input.
		// This is the default/normal.
		stubs_defaults {
		name: "framework-doc-stubs-sources-default",
		defaults: ["framework-doc-stubs-default"],
		@@ -147,12 +146,6 @@ droidstubs {
		" --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 {
		name: "framework-doc-system-stubs",
		defaults: ["framework-doc-stubs-sources-default"],
		@@ -161,11 +154,8 @@ droidstubs {
		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 {
		name: "framework-doc-stubs-module-stubs",
		name: "framework-doc-stubs",
		defaults: ["framework-doc-stubs-default"],
		args: metalava_framework_docs_args,
		srcs: [