Merge "Add a system variant of the merged annotations" (16d14284) · Commits · e / os / android_frameworks_base

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

+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)