diff options
| author | 2024-11-08 13:17:07 +0000 | |
|---|---|---|
| committer | 2024-11-08 13:17:07 +0000 | |
| commit | bfb3ed214970ae7ba1d7818d95d07bf250ece6f1 (patch) | |
| tree | fd7a9debbb58f0263d756abf41df9dd5ab0dafe5 | |
| parent | d4e030c99744b01efcd506ceda3f4cbc246b5243 (diff) | |
| parent | e4553d02a5627b13f74f550bf48a6861e3722ad1 (diff) | |
Merge "Depend on exportable mainline module stubs for doc generation" into main
| -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 513aa4a969a3..c7c56861894d 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -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 } 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) } |