diff options
| author | 2024-11-08 13:58:42 +0000 | |
|---|---|---|
| committer | 2024-11-08 13:58:42 +0000 | |
| commit | 13d3236667d2a80cfc099df13742f17cd07055a0 (patch) | |
| tree | 9658a2f4c4900694f15f27ed55c0fff48e99e604 /api | |
| parent | a66090c3c54b19b74e097781b9c48a0c368a0741 (diff) | |
| parent | 2c8c4fa5d2e6c938a3d7dad3973cc21dd2e2eef3 (diff) | |
Merge "Depend on exportable mainline module stubs for doc generation" into main am: bfb3ed2149 am: 2c8c4fa5d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3342398
Change-Id: I57348dfb755982a4dfba4e2a7ce5232e8e62edb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 6a0167766fd4..cdc5cd120956 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -230,7 +230,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 f32bdc32f75d..5ca24de1b46a 100644 --- a/api/api.go +++ b/api/api.go @@ -429,8 +429,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) } |