diff options
| author | 2022-06-24 19:13:47 +0000 | |
|---|---|---|
| committer | 2022-06-24 19:13:47 +0000 | |
| commit | 035a929561345aa06025657344757b93c2ed42c5 (patch) | |
| tree | 9fb723cfdeb7f36e990bbd43a8bfe5c0f139c8a1 /api/api.go | |
| parent | fb98ab119d1e82a40dd6cab35d2642eb76e6e485 (diff) | |
| parent | 16d142849e947e9aa9d3e35f9f9bf0c8e21d6223 (diff) | |
Merge "Add a system variant of the merged annotations" am: 16d142849e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132126
Change-Id: Ie1f70e7975246f201bc5e2937b3c5dcdc58449eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/api.go')
| -rw-r--r-- | api/api.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/api/api.go b/api/api.go index 22120001af35..bf6b0859ea7f 100644 --- a/api/api.go +++ b/api/api.go @@ -155,6 +155,13 @@ func createMergedPublicAnnotationsFilegroup(ctx android.LoadHookContext, modules ctx.CreateModule(android.FileGroupFactory, &props) } +func createMergedSystemAnnotationsFilegroup(ctx android.LoadHookContext, modules []string) { + props := fgProps{} + props.Name = proptools.StringPtr("all-modules-system-annotations") + props.Srcs = createSrcs(modules, "{.system.annotations.zip}") + ctx.CreateModule(android.FileGroupFactory, &props) +} + func createFilteredApiVersions(ctx android.LoadHookContext, modules []string) { // For the filtered api versions, we prune all APIs except art module's APIs. because // 1) ART apis are available by default to all modules, while other module-to-module deps are @@ -294,6 +301,7 @@ func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) { createMergedFrameworkImpl(ctx, bootclasspath) createMergedPublicAnnotationsFilegroup(ctx, bootclasspath) + createMergedSystemAnnotationsFilegroup(ctx, bootclasspath) createFilteredApiVersions(ctx, bootclasspath) |