diff options
| author | 2024-11-07 19:40:30 +0000 | |
|---|---|---|
| committer | 2024-11-07 19:40:30 +0000 | |
| commit | e4553d02a5627b13f74f550bf48a6861e3722ad1 (patch) | |
| tree | 0be23a39be1dec68a843e8aad9aa729c721b8019 /api | |
| parent | 403de724a12cb69f6a9959c38b605059920c5f89 (diff) | |
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
Diffstat (limited to 'api')
| -rw-r--r-- | api/Android.bp | 2 | ||||
| -rw-r--r-- | api/ApiDocs.bp | 2 | ||||
| -rw-r--r-- | api/api.go | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/api/Android.bp b/api/Android.bp index 7ef00b006949..a98d1d4b4156 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -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 } diff --git a/api/ApiDocs.bp b/api/ApiDocs.bp index e8fcf4b2b32d..1ebe0cdfabd7 100644 --- a/api/ApiDocs.bp +++ b/api/ApiDocs.bp @@ -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: [ diff --git a/api/api.go b/api/api.go index 29083dfc8968..aa89c2450288 100644 --- a/api/api.go +++ b/api/api.go @@ -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) } |