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

Commit 160df6f3 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Add a system variant of the merged annotations" am: 16d14284 am: 035a9295 am: b103f0d7 

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



Change-Id: Iad9692b917483b377eeb0931be8787bb06d4c589
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27ea0bba b103f0d7

api/Android.bp

+20 −6
Original line number Diff line number Diff line
@@ -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",
@@ -210,6 +206,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
@@ -286,6 +293,7 @@ func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) { 
	createMergedFrameworkImpl(ctx, bootclasspath)



	createMergedPublicAnnotationsFilegroup(ctx, bootclasspath)

	createMergedSystemAnnotationsFilegroup(ctx, bootclasspath)



	createFilteredApiVersions(ctx, bootclasspath)