Merge "Re-submit "Change the default docs build to use module stubs"" am: eb2333936e am: 643efb7cfb am: d006973d90

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869971

Change-Id: I8a6b7ed9360cbbe092986af268fdb3fe51ddeea2

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"],
@@ -146,12 +145,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"],
@@ -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: [