Change the default docs build to use module stubs

The two are almost identical, and the target using sources as input
can be deleted.

The diffs that remain are minor and as far as I can tell OK:
- A few constants are removed from the metadata.zip. It looks to
  me like metalava was previously including @SystemApi constants in the
  public SDK's metadata. This bug is now worked around by only feeding
  metalava the public APIs.
- There are some very minor diffs in the docs of a few APIs.

Bug: 186197911
Test: build sdk before/after and diff
Change-Id: Iac7de64f353bc1467fc4b249e531f034ef702d51

1 files changed, 1 insertions, 11 deletions

diff --git a/ApiDocs.bp b/ApiDocs.bp
index a926ddc218a6..8af2e02f8d08 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -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 {
 }
 
 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 +
@@ -160,11 +153,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: [