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

Commit 79d883b7 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ic7554fcb2a7ce3708354ac934b2e636d36e0e23e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b23889c9 d7085489

ApiDocs.bp

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

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

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

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

    args: metalava_framework_docs_args,

    args: metalava_framework_docs_args,

    api_levels_annotations_enabled: true,

    api_levels_module: "api_versions_public",

    api_levels_annotations_dirs: [

        "sdk-dir",

        "api-versions-jars-dir",

    ],

    aidl: {

    aidl: {

        include_dirs: [

        include_dirs: [

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

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

api/api.go

+1 −1
Original line number Original line 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

	// Note: order matters: first parameter is the full api-versions.xml

	// after that the stubs files in any order

	// after that the stubs files in any order

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

	// 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"}}}

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

	ctx.CreateModule(genrule.GenRuleFactory, &props)

	ctx.CreateModule(genrule.GenRuleFactory, &props)

}

}