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

Commit e4553d02 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Depend on exportable mainline module stubs for doc generation 

This change modifies the dependency graph of framework-doc-stubs to
depend on the exportable stub source jar of the mainline modules,
so that the flagged apis symbols are not elided.

Test: m doc dist && unzip -l out/dist/offline-sdk-docs-docs.zip | grep "android/configinfrastructure/aconfig"
Bug: 377585897
Change-Id: I2de643c27417a0ccb21016a3bc495127f3a30f81
parent 403de724

api/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,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)

}