Merge changes I6018791a,Id81c93ea (cd7c59a0) · Commits · e / os / android_frameworks_base

Android.bp

+0 −32

Original line number	Diff line number	Diff line
		@@ -154,38 +154,6 @@ filegroup {
		],
		}

		java_library_with_nonpublic_deps {
		name: "framework-updatable-stubs-module_libs_api",
		static_libs: [
		"android.net.ipsec.ike.stubs.module_lib",
		"framework-appsearch.stubs.module_lib",
		"framework-connectivity.stubs.module_lib",
		"framework-connectivity-tiramisu.stubs.module_lib",
		"framework-graphics.stubs.module_lib",
		"framework-media.stubs.module_lib",
		"framework-mediaprovider.stubs.module_lib",
		"framework-permission.stubs.module_lib",
		"framework-permission-s.stubs.module_lib",
		"framework-scheduling.stubs.module_lib",
		"framework-sdkextensions.stubs.module_lib",
		"framework-statsd.stubs.module_lib",
		"framework-supplementalprocess.stubs.module_lib",
		"framework-tethering.stubs.module_lib",
		"framework-uwb.stubs.module_lib",
		"framework-nearby.stubs.module_lib",
		"framework-wifi.stubs.module_lib",
		],
		soong_config_variables: {
		include_nonpublic_framework_api: {
		static_libs: [
		"framework-supplementalapi.stubs.module_lib",
		],
		},
		},
		sdk_version: "module_current",
		visibility: ["//visibility:private"],
		}

		java_library_with_nonpublic_deps {
		name: "framework-all",
		installable: false,

api/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ bootstrap_go_package {
		"soong",
		"soong-android",
		"soong-genrule",
		"soong-java",
		],
		srcs: ["api.go"],
		pluginFor: ["soong_build"],

api/api.go

+54 −18

Original line number	Diff line number	Diff line
		@@ -21,8 +21,13 @@ import (

		"android/soong/android"
		"android/soong/genrule"
		"android/soong/java"
		)

		const art = "art.module.public.api"
		const conscrypt = "conscrypt.module.public.api"
		const i18n = "i18n.module.public.api"

		// The intention behind this soong plugin is to generate a number of "merged"
		// API-related modules that would otherwise require a large amount of very
		// similar Android.bp boilerplate to define. For example, the merged current.txt
		@@ -69,6 +74,13 @@ type genruleProps struct {
		Visibility []string
		}

		type libraryProps struct {
		Name *string
		Sdk_version *string
		Static_libs []string
		Visibility []string
		}

		// Struct to pass parameters for the various merged [current\|removed].txt file modules we create.
		type MergedTxtDefinition struct {
		// "current.txt" or "removed.txt"
		@@ -130,6 +142,8 @@ func createMergedStubsSrcjar(ctx android.LoadHookContext, modules []string) {
		// This produces the same annotations.zip as framework-doc-stubs, but by using
		// outputs from individual modules instead of all the source code.
		func createMergedAnnotations(ctx android.LoadHookContext, modules []string) {
		// Conscrypt and i18n currently do not enable annotations
		modules = removeAll(modules, []string{conscrypt, i18n})
		props := genruleProps{}
		props.Name = proptools.StringPtr("sdk-annotations.zip")
		props.Tools = []string{"merge_annotation_zips", "soong_zip"}
		@@ -141,6 +155,15 @@ func createMergedAnnotations(ctx android.LoadHookContext, modules []string) {
		}

		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
		// explicit and probably receive more scrutiny anyway
		// 2) The number of ART/libcore APIs is large, so not linting them would create a large gap
		// 3) It's a compromise. Ideally we wouldn't be filtering out any module APIs, and have
		// per-module lint databases that excludes just that module's APIs. Alas, that's more
		// difficult to achieve.
		modules = remove(modules, art)

		props := genruleProps{}
		props.Name = proptools.StringPtr("api-versions-xml-public-filtered")
		props.Tools = []string{"api_versions_trimmer"}
		@@ -154,6 +177,25 @@ func createFilteredApiVersions(ctx android.LoadHookContext, modules []string) {
		ctx.CreateModule(genrule.GenRuleFactory, &props)
		}

		func createMergedModuleLibStubs(ctx android.LoadHookContext, modules []string) {
		// The user of this module compiles against the "core" SDK, so remove core libraries to avoid dupes.
		modules = removeAll(modules, []string{art, conscrypt, i18n})
		props := libraryProps{}
		props.Name = proptools.StringPtr("framework-updatable-stubs-module_libs_api")
		props.Static_libs = appendStr(modules, ".stubs.module_lib")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		ctx.CreateModule(java.LibraryFactory, &props)
		}

		func appendStr(modules []string, s string) []string {
		a := make([]string, 0, len(modules))
		for _, module := range modules {
		a = append(a, module+s)
		}
		return a
		}

		func createSrcs(base string, modules []string, tag string) []string {
		a := make([]string, 0, len(modules)+1)
		a = append(a, base)
		@@ -163,6 +205,13 @@ func createSrcs(base string, modules []string, tag string) []string {
		return a
		}

		func removeAll(s []string, vs []string) []string {
		for _, v := range vs {
		s = remove(s, v)
		}
		return s
		}

		func remove(s []string, v string) []string {
		s2 := make([]string, 0, len(s))
		for _, sv := range s {
		@@ -176,9 +225,7 @@ func remove(s []string, v string) []string {
		func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_classpath []string) {
		var textFiles []MergedTxtDefinition
		// Two module libraries currently do not support @SystemApi so only have the public scope.
		bcpWithSystemApi := bootclasspath
		bcpWithSystemApi = remove(bcpWithSystemApi, "conscrypt.module.public.api")
		bcpWithSystemApi = remove(bcpWithSystemApi, "i18n.module.public.api")
		bcpWithSystemApi := removeAll(bootclasspath, []string{conscrypt, i18n})

		tagSuffix := []string{".api.txt}", ".removed-api.txt}"}
		for i, f := range []string{"current.txt", "removed.txt"} {
		@@ -226,22 +273,11 @@ func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) {

		createMergedStubsSrcjar(ctx, bootclasspath)

		// Conscrypt and i18n currently do not enable annotations
		annotationModules := bootclasspath
		annotationModules = remove(annotationModules, "conscrypt.module.public.api")
		annotationModules = remove(annotationModules, "i18n.module.public.api")
		createMergedAnnotations(ctx, annotationModules)
		createMergedModuleLibStubs(ctx, bootclasspath)

		// 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
		// explicit and probably receive more scrutiny anyway
		// 2) The number of ART/libcore APIs is large, so not linting them would create a large gap
		// 3) It's a compromise. Ideally we wouldn't be filtering out any module APIs, and have
		// per-module lint databases that excludes just that module's APIs. Alas, that's more
		// difficult to achieve.
		filteredModules := bootclasspath
		filteredModules = remove(filteredModules, "art.module.public.api")
		createFilteredApiVersions(ctx, filteredModules)
		createMergedAnnotations(ctx, bootclasspath)

		createFilteredApiVersions(ctx, bootclasspath)
		}

		func combinedApisModuleFactory() android.Module {