drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dedupe default definitions slightly"

Browse Source
This commit is contained in:
Anton Hansson 2022-01-27 15:59:16 +00:00 committed by Gerrit Code Review
commit 1dd24999da
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ApiDocs.bp
View File

@ -55,25 +55,9 @@ framework_docs_only_libs = [
"android-support-multidex-instrumentation", "android-support-multidex-instrumentation",
] ]
// These defaults enable doc-stub generation, api lint database generation and sdk value generation.
stubs_defaults { stubs_defaults {
name: "android-non-updatable-doc-stubs-defaults", name: "android-non-updatable-doc-stubs-defaults",
defaults: [
"android-non-updatable-stubs-defaults",
"module-classpath-stubs-defaults",
],
srcs: [
// No longer part of the stubs, but are included in the docs.
":android-test-base-sources",
":android-test-mock-sources",
":android-test-runner-sources",
],
libs: framework_docs_only_libs,
create_doc_stubs: true,
write_sdk_values: true,
}
stubs_defaults {
name: "framework-doc-stubs-default",
defaults: ["android-non-updatable-stubs-defaults"], defaults: ["android-non-updatable-stubs-defaults"],
srcs: [ srcs: [
// No longer part of the stubs, but are included in the docs. // No longer part of the stubs, but are included in the docs.
@ -83,18 +67,13 @@ stubs_defaults {
], ],
libs: framework_docs_only_libs, libs: framework_docs_only_libs,
create_doc_stubs: true, create_doc_stubs: true,
api_levels_annotations_enabled: true,
api_levels_annotations_dirs: [
"sdk-dir",
"api-versions-jars-dir",
],
write_sdk_values: true, write_sdk_values: true,
} }
// 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.
stubs_defaults { stubs_defaults {
name: "framework-doc-stubs-sources-default", name: "framework-doc-stubs-sources-default",
defaults: ["framework-doc-stubs-default"], defaults: ["android-non-updatable-doc-stubs-defaults"],
srcs: [ srcs: [
":art.module.public.api{.public.stubs.source}", ":art.module.public.api{.public.stubs.source}",
":conscrypt.module.public.api{.public.stubs.source}", ":conscrypt.module.public.api{.public.stubs.source}",
@ -120,13 +99,19 @@ stubs_defaults {
droidstubs { droidstubs {
name: "android-non-updatable-doc-stubs", name: "android-non-updatable-doc-stubs",
defaults: ["android-non-updatable-doc-stubs-defaults"], defaults: [
"android-non-updatable-doc-stubs-defaults",
"module-classpath-stubs-defaults",
],
args: metalava_framework_docs_args, args: metalava_framework_docs_args,
} }
droidstubs { droidstubs {
name: "android-non-updatable-doc-stubs-system", name: "android-non-updatable-doc-stubs-system",
defaults: ["android-non-updatable-doc-stubs-defaults"], defaults: [
"android-non-updatable-doc-stubs-defaults",
"module-classpath-stubs-defaults",
],
args: metalava_framework_docs_args + args: metalava_framework_docs_args +
" --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ",
} }
@ -136,14 +121,24 @@ droidstubs {
defaults: ["framework-doc-stubs-sources-default"], defaults: ["framework-doc-stubs-sources-default"],
args: metalava_framework_docs_args + args: metalava_framework_docs_args +
" --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ",
api_levels_annotations_enabled: true,
api_levels_annotations_dirs: [
"sdk-dir",
"api-versions-jars-dir",
],
api_levels_sdk_type: "system", api_levels_sdk_type: "system",
} }
droidstubs { droidstubs {
name: "framework-doc-stubs", name: "framework-doc-stubs",
defaults: ["framework-doc-stubs-default"], defaults: ["android-non-updatable-doc-stubs-defaults"],
srcs: [":all-modules-public-stubs-source"], srcs: [":all-modules-public-stubs-source"],
args: metalava_framework_docs_args, args: metalava_framework_docs_args,
api_levels_annotations_enabled: true,
api_levels_annotations_dirs: [
"sdk-dir",
"api-versions-jars-dir",
],
aidl: { aidl: {
local_include_dirs: [ local_include_dirs: [
"apex/media/aidl/stable", "apex/media/aidl/stable",