diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/Android.bp | 26 | ||||
| -rw-r--r-- | api/api.go | 8 |
2 files changed, 28 insertions, 6 deletions
diff --git a/api/Android.bp b/api/Android.bp index 72ac427380e6..9fb7b35605b8 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -195,12 +195,8 @@ genrule { // This produces the same annotations.zip as framework-doc-stubs, but by using // outputs from individual modules instead of all the source code. -genrule { - name: "sdk-annotations.zip", - srcs: [ - ":android-non-updatable-doc-stubs{.annotations.zip}", - ":all-modules-public-annotations", - ], +genrule_defaults { + name: "sdk-annotations-defaults", out: ["annotations.zip"], tools: [ "merge_annotation_zips", @@ -211,6 +207,24 @@ genrule { } genrule { + name: "sdk-annotations.zip", + defaults: ["sdk-annotations-defaults"], + srcs: [ + ":android-non-updatable-doc-stubs{.annotations.zip}", + ":all-modules-public-annotations", + ], +} + +genrule { + name: "sdk-annotations-system.zip", + defaults: ["sdk-annotations-defaults"], + srcs: [ + ":android-non-updatable-doc-stubs-system{.annotations.zip}", + ":all-modules-system-annotations", + ], +} + +genrule { name: "combined-removed-dex", visibility: [ "//frameworks/base/boot", diff --git a/api/api.go b/api/api.go index a0d066ad5b58..f15804156bdf 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 @@ -286,6 +293,7 @@ func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) { createMergedFrameworkImpl(ctx, bootclasspath) createMergedPublicAnnotationsFilegroup(ctx, bootclasspath) + createMergedSystemAnnotationsFilegroup(ctx, bootclasspath) createFilteredApiVersions(ctx, bootclasspath) |