Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74b15641 authored by Anton Hansson's avatar Anton Hansson
Browse files

Add a system variant of the merged annotations 

This is going to be disted instead of the monolithic one being
used currently.

Bug: 235140934
Test: m sdk-annotations{,-system}.zip and diff; manual spot checking
Test: m sdk dist && diff out/dist/system-data/annotations.zip with this
Change-Id: I9874f88e933a8b804a73638e6bac7a9d312c7c9f
parent 0c5d9ab5

api/Android.bp

+20 −6
Original line number Diff line number Diff line
@@ -190,12 +190,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",
@@ -205,6 +201,24 @@ genrule { 
        "$(location soong_zip) -o $(out) -C $(genDir)/out -D $(genDir)/out",

}



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: [

api/api.go

+8 −0
Original line number Diff line number Diff line
@@ -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)