Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor merged annotations creation" am: 24f473395d am: 6ca396706d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132125

Change-Id: I42b2f8b7e4bfbee7077a658753304af0debbf4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anton Hansson
2022-06-24 19:33:38 +00:00
committed by Automerger Merge Worker
parent cc4630cdbf 6ca396706d
commit d4b424edeb
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/Android.bp
View File

@@ -193,6 +193,23 @@ genrule {
"$(location :frameworks-base-api-module-lib-current.txt)", "$(location :frameworks-base-api-module-lib-current.txt)",
} }
// 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",
],
out: ["annotations.zip"],
tools: [
"merge_annotation_zips",
"soong_zip",
],
cmd: "$(location merge_annotation_zips) $(genDir)/out $(in) && " +
"$(location soong_zip) -o $(out) -C $(genDir)/out -D $(genDir)/out",
}
genrule { genrule {
name: "combined-removed-dex", name: "combined-removed-dex",
visibility: [ visibility: [

18
api/api.go
View File

@@ -148,17 +148,11 @@ func createMergedStubsSrcjar(ctx android.LoadHookContext, modules []string) {
ctx.CreateModule(genrule.GenRuleFactory, &props) ctx.CreateModule(genrule.GenRuleFactory, &props)
} }
// This produces the same annotations.zip as framework-doc-stubs, but by using func createMergedPublicAnnotationsFilegroup(ctx android.LoadHookContext, modules []string) {
// outputs from individual modules instead of all the source code. props := fgProps{}
func createMergedAnnotations(ctx android.LoadHookContext, modules []string) { props.Name = proptools.StringPtr("all-modules-public-annotations")
props := genruleProps{} props.Srcs = createSrcs(modules, "{.public.annotations.zip}")
props.Name = proptools.StringPtr("sdk-annotations.zip") ctx.CreateModule(android.FileGroupFactory, &props)
props.Tools = []string{"merge_annotation_zips", "soong_zip"}
props.Out = []string{"annotations.zip"}
props.Cmd = proptools.StringPtr("$(location merge_annotation_zips) $(genDir)/out $(in) && " +
"$(location soong_zip) -o $(out) -C $(genDir)/out -D $(genDir)/out")
props.Srcs = append([]string{":android-non-updatable-doc-stubs{.annotations.zip}"}, createSrcs(modules, "{.public.annotations.zip}")...)
ctx.CreateModule(genrule.GenRuleFactory, &props)
} }
func createFilteredApiVersions(ctx android.LoadHookContext, modules []string) { func createFilteredApiVersions(ctx android.LoadHookContext, modules []string) {
@@ -291,7 +285,7 @@ func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) {
createMergedFrameworkModuleLibStubs(ctx, bootclasspath) createMergedFrameworkModuleLibStubs(ctx, bootclasspath)
createMergedFrameworkImpl(ctx, bootclasspath) createMergedFrameworkImpl(ctx, bootclasspath)
createMergedAnnotations(ctx, bootclasspath) createMergedPublicAnnotationsFilegroup(ctx, bootclasspath)
createFilteredApiVersions(ctx, bootclasspath) createFilteredApiVersions(ctx, bootclasspath)