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

Commit 87f04b8d authored by Anton Hansson's avatar Anton Hansson
Browse files

Make framework-doc-stubs use jarstub defaults 

These stubs used to duplicate all the properties in the defaults
we had already defined, but did not set e.g. sdk_version: "none",
which meant certain symbols were imported twice (which is error
prone / wrong as they could potentially be different).

Test: m framework-doc-stubs before & after and diff soong intermediates
Change-Id: I96dfa66a9deea3564980678fd64f2bfc6460eebd
parent 9dce832e

ApiDocs.bp

+1 −19
Original line number Diff line number Diff line
@@ -74,39 +74,21 @@ stubs_defaults { 


stubs_defaults {

    name: "framework-doc-stubs-default",

    defaults: ["android-non-updatable-stubs-defaults"],

    srcs: [

        ":android-non-updatable-stub-sources",



        // No longer part of the stubs, but are included in the docs.

        ":android-test-base-sources",

        ":android-test-mock-sources",

        ":android-test-runner-sources",

    ],

    arg_files: [

        "core/res/AndroidManifest.xml",

    ],

    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",

        "api-versions-jars-dir",

    ],

    previous_api: ":android.api.public.latest",

    merge_annotations_dirs: [

        "metalava-manual",

    ],

    write_sdk_values: true,

    // TODO(b/169090544): remove below aidl includes.

    aidl: {

        local_include_dirs: ["media/aidl"],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

        ],

    },

}



// Defaults module for doc-stubs targets that use module source code as input.