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

Merge "Apply the same filtering for docstubs and jarstubs" am: 46dff8e09f am: 8f1928f4ca

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

Change-Id: I677802ea22a342a9fae1e50e1f9ad91593e1251f
This commit is contained in:
Anton Hansson
2021-05-11 12:23:54 +00:00
committed by Automerger Merge Worker
parent 4eecbfcd41 8f1928f4ca
commit 9e8186aaaf
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Android.bp
View File

@ -435,6 +435,19 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x
"--api-lint-ignore-prefix junit. " + "--api-lint-ignore-prefix junit. " +
"--api-lint-ignore-prefix org. " "--api-lint-ignore-prefix org. "
packages_to_document = [
"android",
"dalvik",
"java",
"javax",
"junit",
"org.apache.http",
"org.json",
"org.w3c.dom",
"org.xml.sax",
"org.xmlpull",
]
filegroup { filegroup {
name: "android-non-updatable-stub-sources", name: "android-non-updatable-stub-sources",
srcs: [ srcs: [
@ -493,6 +506,7 @@ stubs_defaults {
// NOTE: The below can be removed once the prebuilt stub contains IKE. // NOTE: The below can be removed once the prebuilt stub contains IKE.
"sdk_system_current_android.net.ipsec.ike", "sdk_system_current_android.net.ipsec.ike",
], ],
filter_packages: packages_to_document,
high_mem: true, // Lots of sources => high memory use, see b/170701554 high_mem: true, // Lots of sources => high memory use, see b/170701554
installable: false, installable: false,
annotations_enabled: true, annotations_enabled: true,

1
ApiDocs.bp
View File

@ -96,6 +96,7 @@ stubs_defaults {
libs: framework_docs_only_libs, libs: framework_docs_only_libs,
create_doc_stubs: true, create_doc_stubs: true,
annotations_enabled: true, annotations_enabled: true,
filter_packages: packages_to_document,
api_levels_annotations_enabled: true, api_levels_annotations_enabled: true,
api_levels_annotations_dirs: [ api_levels_annotations_dirs: [
"sdk-dir", "sdk-dir",

14
StubLibraries.bp
View File

@ -27,24 +27,10 @@
// Common metalava configs // Common metalava configs
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
packages_to_document = [
"android",
"dalvik",
"java",
"javax",
"junit",
"org.apache.http",
"org.json",
"org.w3c.dom",
"org.xml.sax",
"org.xmlpull",
]
stubs_defaults { stubs_defaults {
name: "metalava-non-updatable-api-stubs-default", name: "metalava-non-updatable-api-stubs-default",
defaults: ["android-non-updatable-stubs-defaults"], defaults: ["android-non-updatable-stubs-defaults"],
api_levels_annotations_enabled: false, api_levels_annotations_enabled: false,
filter_packages: packages_to_document,
defaults_visibility: ["//visibility:private"], defaults_visibility: ["//visibility:private"],
} }