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

Commit 2c8c4fa5 authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Automerger Merge Worker
Browse files

Merge "Depend on exportable mainline module stubs for doc generation" into main am: bfb3ed21 

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



Change-Id: Ie459e9775718bb779d768c65fbef3d433aabd3a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77f1143b bfb3ed21

api/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ java_genrule { 
    cmd: "$(location merge_zips) $(out) $(in)",

    srcs: [

        ":api-stubs-docs-non-updatable{.exportable}",

        ":all-modules-public-stubs-source",

        ":all-modules-public-stubs-source-exportable",

    ],

    visibility: ["//visibility:private"], // Used by make module in //development, mind

}

api/ApiDocs.bp

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ droidstubs { 
droidstubs {

    name: "framework-doc-stubs",

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

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

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

    api_levels_module: "api_versions_public",

    aidl: {

        include_dirs: [

api/api.go

+3 −2
Original line number Diff line number Diff line
@@ -428,8 +428,9 @@ func createMergedFrameworkSystemServerExportableStubs(ctx android.LoadHookContex 


func createPublicStubsSourceFilegroup(ctx android.LoadHookContext, modules proptools.Configurable[[]string]) {

	props := fgProps{}

	props.Name = proptools.StringPtr("all-modules-public-stubs-source")

	props.Device_common_srcs = createSrcs(modules, "{.public.stubs.source}")

	props.Name = proptools.StringPtr("all-modules-public-stubs-source-exportable")

	transformConfigurableArray(modules, "", ".stubs.source")

	props.Device_common_srcs = createSrcs(modules, "{.exportable}")

	props.Visibility = []string{"//frameworks/base"}

	ctx.CreateModule(android.FileGroupFactory, &props)

}