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

Commit c3b789f8 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Use lint database from api_version_public" am: 39ebb3b0 am:... 

Merge "Merge "Use lint database from api_version_public" am: 39ebb3b0 am: d7085489" into tm-dev-plus-aosp
parents 6acd9fbb 79d883b7

ApiDocs.bp

+1 −5
Original line number Diff line number Diff line
@@ -139,11 +139,7 @@ droidstubs { 
    defaults: ["android-non-updatable-doc-stubs-defaults"],

    srcs: [":all-modules-public-stubs-source"],

    args: metalava_framework_docs_args,

    api_levels_annotations_enabled: true,

    api_levels_annotations_dirs: [

        "sdk-dir",

        "api-versions-jars-dir",

    ],

    api_levels_module: "api_versions_public",

    aidl: {

        include_dirs: [

            "packages/modules/Connectivity/framework/aidl-export",

api/api.go

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ func createFilteredApiVersions(ctx android.LoadHookContext, modules []string) { 
	// Note: order matters: first parameter is the full api-versions.xml

	// after that the stubs files in any order

	// stubs files are all modules that export API surfaces EXCEPT ART

	props.Srcs = append([]string{":framework-doc-stubs{.api_versions.xml}"}, createSrcs(modules, ".stubs{.jar}")...)

	props.Srcs = append([]string{":api_versions_public{.api_versions.xml}"}, createSrcs(modules, ".stubs{.jar}")...)

	props.Dists = []android.Dist{{Targets: []string{"sdk"}}}

	ctx.CreateModule(genrule.GenRuleFactory, &props)

}