Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 369bb74a authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Apply the same filtering for docstubs and jarstubs" am: 46dff8e0 am:... 

Merge "Apply the same filtering for docstubs and jarstubs" am: 46dff8e0 am: 8f1928f4 am: 9e8186aa

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

Change-Id: I83b173302f75d5536e47fcbb221fe806c691536a
parents d85097d1 9e8186aa

Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -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,

ApiDocs.bp

+1 −0
Original line number Diff line number Diff line
@@ -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",

StubLibraries.bp

+0 −14
Original line number Diff line number Diff line
@@ -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"],

}