Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Id4ffc6505a2da185a17940dbc61e9d956126202a
This commit is contained in:
Anton Hansson
2021-10-28 14:48:24 +00:00
committed by Automerger Merge Worker
parent a59b773743 643efb7cfb
commit d006973d90
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApiDocs.bp
View File

@@ -112,7 +112,6 @@ stubs_defaults {
} }
// Defaults module for doc-stubs targets that use module source code as input. // Defaults module for doc-stubs targets that use module source code as input.
// This is the default/normal.
stubs_defaults { stubs_defaults {
name: "framework-doc-stubs-sources-default", name: "framework-doc-stubs-sources-default",
defaults: ["framework-doc-stubs-default"], defaults: ["framework-doc-stubs-default"],
@@ -146,12 +145,6 @@ droidstubs {
" --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", " --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 { droidstubs {
name: "framework-doc-system-stubs", name: "framework-doc-system-stubs",
defaults: ["framework-doc-stubs-sources-default"], defaults: ["framework-doc-stubs-sources-default"],
@@ -160,11 +153,8 @@ droidstubs {
api_levels_sdk_type: "system", 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 { droidstubs {
name: "framework-doc-stubs-module-stubs", name: "framework-doc-stubs",
defaults: ["framework-doc-stubs-default"], defaults: ["framework-doc-stubs-default"],
args: metalava_framework_docs_args, args: metalava_framework_docs_args,
srcs: [ srcs: [