Merge "Revert "Change the default docs build to use module stubs""
diff --git a/ApiDocs.bp b/ApiDocs.bp
index 8af2e02..a926ddc 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -112,6 +112,7 @@
}
// 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"],
@@ -146,6 +147,12 @@
}
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"],
args: metalava_framework_docs_args +
@@ -153,8 +160,11 @@
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",
+ name: "framework-doc-stubs-module-stubs",
defaults: ["framework-doc-stubs-default"],
args: metalava_framework_docs_args,
srcs: [