diff options
| author | Anton Hansson <hansson@google.com> | 2021-05-11 12:59:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 12:59:34 +0000 |
| commit | 369bb74a97fdc759edf72d140384a75d69d39fd1 (patch) | |
| tree | 038215d2abc99e11391dee7ffda4cef12884e112 | |
| parent | d85097d1ad083cd97ccde5c71c2e603032f3aa51 (diff) | |
| parent | 9e8186aaaf3ffeb001bbfcd77dd4f2e7e7903763 (diff) | |
Merge "Apply the same filtering for docstubs and jarstubs" am: 46dff8e09f am: 8f1928f4ca am: 9e8186aaaf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700027
Change-Id: I83b173302f75d5536e47fcbb221fe806c691536a
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | ApiDocs.bp | 1 | ||||
| -rw-r--r-- | StubLibraries.bp | 14 |
3 files changed, 15 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp index 4857f1b5d1ed..7c9cdcfb9826 100644 --- a/Android.bp +++ b/Android.bp @@ -483,6 +483,19 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x "--api-lint-ignore-prefix junit. " + "--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 { name: "android-non-updatable-stub-sources", srcs: [ @@ -544,6 +557,7 @@ stubs_defaults { // NOTE: The below can be removed once the prebuilt stub contains 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 installable: false, annotations_enabled: true, diff --git a/ApiDocs.bp b/ApiDocs.bp index 74dd78f9ae96..0aed5d9abea9 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -100,6 +100,7 @@ stubs_defaults { libs: framework_docs_only_libs, create_doc_stubs: true, annotations_enabled: true, + filter_packages: packages_to_document, api_levels_annotations_enabled: true, api_levels_annotations_dirs: [ "sdk-dir", diff --git a/StubLibraries.bp b/StubLibraries.bp index 7b8a68700b0a..ed24d43eda10 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -27,24 +27,10 @@ // 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 { name: "metalava-non-updatable-api-stubs-default", defaults: ["android-non-updatable-stubs-defaults"], api_levels_annotations_enabled: false, - filter_packages: packages_to_document, defaults_visibility: ["//visibility:private"], } |