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

Commit bfb3ed21 authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Gerrit Code Review
Browse files

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

parents d4e030c9 e4553d02

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)

}