summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2021-10-26 15:29:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-26 15:29:58 +0000
commitcff20397e7e257b8bc493b795b3e717b9563a4fd (patch)
tree1343240755e16293f28efba967e05c3124a7b8bf
parentf0a719610ba2fc987206fc7ce810497f113d99ab (diff)
parentd551b3eb55f923fb0d34075656bc4a5295f65bad (diff)
Merge "Revert "Change the default docs build to use module stubs"" am: 56e85bb8c0 am: d23ac2655d am: 221a2267c3 am: f3d020454f am: d551b3eb55
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869970 Change-Id: I00c1f73e560972785b1b549637e9af713aac22e8
-rw-r--r--ApiDocs.bp12
1 files changed, 11 insertions, 1 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp
index 82759f767c3e..1e5ae7bb6270 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -112,6 +112,7 @@ 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,6 +148,12 @@ 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 +
@@ -154,8 +161,11 @@ 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",
+ name: "framework-doc-stubs-module-stubs",
defaults: ["framework-doc-stubs-default"],
args: metalava_framework_docs_args,
srcs: [