Snap for 10950137 from a8d3021ee54460e745e73459b3292be690a07797 to 24Q1-release (17d8d08d) · Commits · e / os / android_build_soong

android/allowlists/allowlists.go

+102 −101

Original line number	Diff line number	Diff line
		@@ -174,6 +174,7 @@ var (
		"external/jsr330": Bp2BuildDefaultTrueRecursively,
		"external/junit": Bp2BuildDefaultTrueRecursively,
		"external/kotlinc": Bp2BuildDefaultTrueRecursively,
		"external/kotlinx.coroutines": Bp2BuildDefaultTrueRecursively,
		"external/libaom": Bp2BuildDefaultTrueRecursively,
		"external/libavc": Bp2BuildDefaultTrueRecursively,
		"external/libcap": Bp2BuildDefaultTrueRecursively,
		@@ -186,8 +187,8 @@ var (
		"external/libhevc": Bp2BuildDefaultTrueRecursively,
		"external/libjpeg-turbo": Bp2BuildDefaultTrueRecursively,
		"external/libmpeg2": Bp2BuildDefaultTrueRecursively,
		"external/libpng": Bp2BuildDefaultTrueRecursively,
		"external/libphonenumber": Bp2BuildDefaultTrueRecursively,
		"external/libpng": Bp2BuildDefaultTrueRecursively,
		"external/libvpx": Bp2BuildDefaultTrueRecursively,
		"external/libyuv": Bp2BuildDefaultTrueRecursively,
		"external/lz4/lib": Bp2BuildDefaultTrue,
		@@ -203,11 +204,12 @@ var (
		"external/pcre": Bp2BuildDefaultTrueRecursively,
		"external/perfmark/api": Bp2BuildDefaultTrueRecursively,
		"external/protobuf": Bp2BuildDefaultTrueRecursively,
		"external/python/pyyaml/lib/yaml": Bp2BuildDefaultTrueRecursively,
		"external/python/six": Bp2BuildDefaultTrueRecursively,
		"external/python/jinja/src": Bp2BuildDefaultTrueRecursively,
		"external/python/markupsafe/src": Bp2BuildDefaultTrueRecursively,
		"external/python/pyfakefs/pyfakefs": Bp2BuildDefaultTrueRecursively,
		"external/python/pyyaml/lib/yaml": Bp2BuildDefaultTrueRecursively,
		"external/python/setuptools": Bp2BuildDefaultTrueRecursively,
		"external/python/six": Bp2BuildDefaultTrueRecursively,
		"external/rappor": Bp2BuildDefaultTrueRecursively,
		"external/scudo": Bp2BuildDefaultTrueRecursively,
		"external/selinux/checkpolicy": Bp2BuildDefaultTrueRecursively,
		@@ -218,6 +220,7 @@ var (
		"external/tinyalsa": Bp2BuildDefaultTrueRecursively,
		"external/tinyalsa_new": Bp2BuildDefaultTrueRecursively,
		"external/toybox": Bp2BuildDefaultTrueRecursively,
		"external/truth": Bp2BuildDefaultTrueRecursively,
		"external/xz-java": Bp2BuildDefaultTrueRecursively,
		"external/zlib": Bp2BuildDefaultTrueRecursively,
		"external/zopfli": Bp2BuildDefaultTrueRecursively,
		@@ -237,6 +240,7 @@ var (
		"frameworks/base/apex/jobscheduler/service/jni": Bp2BuildDefaultTrueRecursively,
		"frameworks/base/core/java": Bp2BuildDefaultTrue,
		"frameworks/base/core/res": Bp2BuildDefaultTrueRecursively,
		"frameworks/base/errorprone": Bp2BuildDefaultTrueRecursively,
		"frameworks/base/libs/androidfw": Bp2BuildDefaultTrue,
		"frameworks/base/libs/services": Bp2BuildDefaultTrue,
		"frameworks/base/media/tests/MediaDump": Bp2BuildDefaultTrue,
		@@ -254,7 +258,8 @@ var (
		"frameworks/hardware/interfaces/displayservice": Bp2BuildDefaultTrueRecursively,
		"frameworks/hardware/interfaces/stats/aidl": Bp2BuildDefaultTrue,
		"frameworks/libs/modules-utils/build": Bp2BuildDefaultTrueRecursively,
		"frameworks/libs/modules-utils/java": Bp2BuildDefaultTrue,
		"frameworks/libs/modules-utils/java": Bp2BuildDefaultTrueRecursively,
		"frameworks/libs/modules-utils/java/com/android/modules/utils/testing": Bp2BuildDefaultFalseRecursively,
		"frameworks/native": Bp2BuildDefaultTrue,
		"frameworks/native/libs/adbd_auth": Bp2BuildDefaultTrueRecursively,
		"frameworks/native/libs/arect": Bp2BuildDefaultTrueRecursively,
		@@ -329,28 +334,29 @@ var (
		"packages/apps/Protips": Bp2BuildDefaultTrue,
		"packages/apps/SafetyRegulatoryInfo": Bp2BuildDefaultTrue,
		"packages/apps/WallpaperPicker": Bp2BuildDefaultTrue,
		"packages/modules/NeuralNetworks/driver/cache": Bp2BuildDefaultTrueRecursively,
		"packages/modules/StatsD/lib/libstatssocket": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb": Bp2BuildDefaultTrue,
		"packages/modules/adb/apex": Bp2BuildDefaultTrue,
		"packages/modules/adb/fastdeploy": Bp2BuildDefaultTrue,
		"packages/modules/adb/crypto": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/libs": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/pairing_auth": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/pairing_connection": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/proto": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/tls": Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/bpf_progs": Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/service-t": Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/service/native": Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/staticlibs/native": Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/staticlibs/netd": Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/staticlibs/netd/libnetdutils": Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/tests/unit/jni": Bp2BuildDefaultTrueRecursively,
		"packages/modules/Gki/libkver": Bp2BuildDefaultTrue,
		"packages/modules/NetworkStack/common/captiveportal": Bp2BuildDefaultTrue,
		"packages/modules/NeuralNetworks/apex": Bp2BuildDefaultTrue,
		"packages/modules/NeuralNetworks/apex/testing": Bp2BuildDefaultTrue,
		"packages/modules/NeuralNetworks/driver/cache": Bp2BuildDefaultTrueRecursively,
		"packages/modules/SdkExtensions/gen_sdk": Bp2BuildDefaultTrue,
		"packages/modules/StatsD/lib/libstatssocket": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb": Bp2BuildDefaultTrue,
		"packages/modules/adb/apex": Bp2BuildDefaultTrue,
		"packages/modules/adb/crypto": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/fastdeploy": Bp2BuildDefaultTrue,
		"packages/modules/adb/libs": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/pairing_auth": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/pairing_connection": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/proto": Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/tls": Bp2BuildDefaultTrueRecursively,
		"packages/modules/common/proto": Bp2BuildDefaultTrue,
		"packages/providers/MediaProvider/tools/dialogs": Bp2BuildDefaultFalse, // TODO(b/242834374)
		"packages/screensavers/Basic": Bp2BuildDefaultTrue,
		@@ -362,19 +368,20 @@ var (

		"prebuilts/clang/host/linux-x86": Bp2BuildDefaultTrueRecursively,
		"prebuilts/gradle-plugin": Bp2BuildDefaultTrueRecursively,
		"prebuilts/runtime/mainline/platform/sdk": Bp2BuildDefaultTrueRecursively,
		"prebuilts/module_sdk": Bp2BuildDefaultTrueRecursively,
		"prebuilts/runtime/mainline/platform/sdk": Bp2BuildDefaultTrueRecursively,
		"prebuilts/sdk": Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/androidx": Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/androidx-legacy": Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/extras/app-toolkit": Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/extras/constraint-layout-x": Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/extras/material-design-x": Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/extras/app-toolkit": Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/support": Bp2BuildDefaultTrue,
		"prebuilts/tools": Bp2BuildDefaultTrue,
		"prebuilts/tools/common/m2": Bp2BuildDefaultTrue,
		"prebuilts/r8": Bp2BuildDefaultTrueRecursively,

		"sdk/annotations": Bp2BuildDefaultTrueRecursively,
		"sdk/dumpeventlog": Bp2BuildDefaultTrue,
		"sdk/eventanalyzer": Bp2BuildDefaultTrue,

		@@ -455,6 +462,7 @@ var (

		"test/vts/vts_hal_hidl_target": Bp2BuildDefaultTrueRecursively,

		"toolchain/pgo-profiles": Bp2BuildDefaultTrueRecursively,
		"tools/apifinder": Bp2BuildDefaultTrue,
		"tools/apksig": Bp2BuildDefaultTrue,
		"tools/dexter/slicer": Bp2BuildDefaultTrueRecursively,
		@@ -622,6 +630,7 @@ var (
		"codec2_soft_exports",
		"compatibility_matrix_schema",
		"framework-connectivity-protos",
		"framework-connectivity-javastream-protos",
		"gemmlowp_headers",
		"gl_headers",
		"libandroid_runtime_lazy",
		@@ -854,15 +863,6 @@ var (
		// for api_fingerprint.txt generation
		"api_fingerprint",

		// allowlisting for kotlinx_coroutines
		"annotations",
		"kotlinx-coroutines-android-annotation-stubs",
		"kotlinx-coroutines-core",
		"kotlinx_coroutines",
		"kotlinx_coroutines-device",
		"kotlinx_coroutines-host",
		"kotlinx_coroutines_android",

		// for building com.android.neuralnetworks
		"libimapper_stablec",
		"libimapper_providerutils",
		@@ -974,7 +974,6 @@ var (
		"protoc-gen-grpc-java-plugin",
		"perfetto_trace-full",
		"tf-remote-client",
		"truth",
		"tradefed-lite",
		"tradefed-isolation-protos",
		"snakeyaml_patched_src_files",
		@@ -1006,6 +1005,8 @@ var (

		"libandroid_net_connectivity_com_android_net_module_util_jni",
		"libservice-connectivity",

		"mainline_modules_sdks_test",
		}

		Bp2buildModuleTypeAlwaysConvertList = []string{
		@@ -1122,6 +1123,11 @@ var (
		// rust support
		"libtombstoned_client_rust_bridge_code", "libtombstoned_client_wrapper", // rust conversions are not supported

		// TODO: b/303474748 - aidl rules for java are incompatible with parcelable declarations
		"modules-utils-list-slice",
		"modules-utils-os",
		"modules-utils-synchronous-result-receiver",

		// unconverted deps
		"CarHTMLViewer", // depends on unconverted modules android.car-stubs, car-ui-lib
		"adb", // depends on unconverted modules: AdbWinApi, libandroidfw, libopenscreen-discovery, libopenscreen-platform-impl, libusb, bin2c_fastdeployagent, AdbWinUsbApi
		@@ -1165,6 +1171,7 @@ var (
		"libstatslog_art", // depends on unconverted modules: statslog_art.cpp, statslog_art.h
		"linker_reloc_bench_main", // depends on unconverted modules: liblinker_reloc_bench_*
		"malloc-rss-benchmark", // depends on unconverted modules: libmeminfo
		"modules-utils-expresslog", // depends on unconverted modules: framework-statsd
		"pbtombstone", "crash_dump", // depends on libdebuggerd, libunwindstack
		"releasetools_test", // depends on unconverted modules: com.android.apex.compressed.v1
		"robolectric-sqlite4java-0.282", // depends on unconverted modules: robolectric-sqlite4java-import, robolectric-sqlite4java-native
		@@ -1660,13 +1667,7 @@ var (
		"libtest_with_dependency_loop_c",
		"libtestshared",

		// depends on unconverted libprotobuf-java-nano
		"dnsresolverprotosnano",
		"launcherprotosnano",
		"datastallprotosnano",
		"devicepolicyprotosnano",
		"ota_metadata_proto_java",
		"merge_ota",
		"merge_ota", // depends on ota_metadata_proto_java

		// releasetools
		"verity_utils",

bp2build/java_library_conversion_test.go

+46 −3

Original line number	Diff line number	Diff line
		@@ -192,6 +192,45 @@ func TestJavaLibraryJavaVersion(t *testing.T) {
		})
		}

		func TestJavaLibraryOpenjdk9(t *testing.T) {
		runJavaLibraryTestCase(t, Bp2buildTestCase{
		Blueprint: `java_library {
		name: "java-lib-1",
		srcs: ["a.java"],
		exclude_srcs: ["b.java"],
		javacflags: ["flag"],
		target: {
		android: {
		srcs: ["android.java"],
		},
		},
		openjdk9: {
		srcs: ["b.java", "foo.java"],
		javacflags: ["extraflag"],
		},
		sdk_version: "current",
		}`,
		ExpectedBazelTargets: []string{
		MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
		"srcs": `[
		"a.java",
		"foo.java",
		] + select({
		"//build/bazel_common_rules/platforms/os:android": ["android.java"],
		"//conditions:default": [],
		})`,
		"sdk_version": `"current"`,
		"javacopts": `[
		"flag",
		"extraflag",
		]`,
		}),
		MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
		},
		})

		}

		func TestJavaLibraryErrorproneEnabledManually(t *testing.T) {
		runJavaLibraryTestCaseWithRegistrationCtxFunc(t, Bp2buildTestCase{
		StubbedBuildDefinitions: []string{"plugin2"},
		@@ -424,6 +463,7 @@ func TestJavaLibraryResourcesWithMultipleDirs(t *testing.T) {
		},
		Blueprint: `java_library {
		name: "java-lib-1",
		srcs: ["foo.java"],
		java_resource_dirs: ["res", "res1"],
		sdk_version: "current",
		}`,
		@@ -433,9 +473,10 @@ func TestJavaLibraryResourcesWithMultipleDirs(t *testing.T) {
		"resources": `["res1/b.res"]`,
		}),
		MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
		"additional_resources": `["java-lib-1_resource_dir_res1"]`,
		"deps": `["java-lib-1_resource_dir_res1"]`,
		"resources": `["res/a.res"]`,
		"resource_strip_prefix": `"res"`,
		"srcs": `["foo.java"]`,
		"sdk_version": `"current"`,
		}),
		MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
		@@ -453,6 +494,7 @@ func TestJavaLibraryJavaResourcesAndResourceDirs(t *testing.T) {
		java_resources: ["res1", "res2"],
		java_resource_dirs: ["resdir"],
		sdk_version: "current",
		srcs: ["foo.java"],
		}`,
		ExpectedBazelTargets: []string{
		MakeBazelTarget("java_resources", "java-lib-1_resource_dir_resdir", AttrNameToString{
		@@ -460,12 +502,13 @@ func TestJavaLibraryJavaResourcesAndResourceDirs(t *testing.T) {
		"resources": `["resdir/a.res"]`,
		}),
		MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
		"additional_resources": `["java-lib-1_resource_dir_resdir"]`,
		"deps": `["java-lib-1_resource_dir_resdir"]`,
		"resource_strip_prefix": `"."`,
		"resources": `[
		"res1",
		"res2",
		]`,
		"srcs": `["foo.java"]`,
		"sdk_version": `"current"`,
		}),
		MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
		@@ -1025,7 +1068,7 @@ filegroup {
		"srcs": `["a.java"]`,
		"resources": `["a.res"]`,
		"resource_strip_prefix": `"."`,
		"additional_resources": `[
		"deps": `[
		"java-lib-1_filegroup_resources_filegroup1",
		"java-lib-1_filegroup_resources_filegroup2",
		]`,

bp2build/prebuilt_etc_conversion_test.go

+37 −3

Original line number	Diff line number	Diff line
		@@ -26,10 +26,17 @@ func runPrebuiltEtcTestCase(t *testing.T, tc Bp2buildTestCase) {
		t.Helper()
		(&tc).ModuleTypeUnderTest = "prebuilt_etc"
		(&tc).ModuleTypeUnderTestFactory = etc.PrebuiltEtcFactory
		RunBp2BuildTestCase(t, registerPrebuiltEtcModuleTypes, tc)
		RunBp2BuildTestCase(t, registerPrebuiltModuleTypes, tc)
		}

		func registerPrebuiltEtcModuleTypes(ctx android.RegistrationContext) {
		func runPrebuiltRootHostTestCase(t *testing.T, tc Bp2buildTestCase) {
		t.Helper()
		(&tc).ModuleTypeUnderTest = "prebuilt_root_host"
		(&tc).ModuleTypeUnderTestFactory = etc.PrebuiltRootHostFactory
		RunBp2BuildTestCase(t, registerPrebuiltModuleTypes, tc)
		}

		func registerPrebuiltModuleTypes(ctx android.RegistrationContext) {
		}

		func TestPrebuiltEtcSimple(t *testing.T) {
		@@ -160,7 +167,7 @@ func runPrebuiltUsrShareTestCase(t *testing.T, tc Bp2buildTestCase) {
		t.Helper()
		(&tc).ModuleTypeUnderTest = "prebuilt_usr_share"
		(&tc).ModuleTypeUnderTestFactory = etc.PrebuiltUserShareFactory
		RunBp2BuildTestCase(t, registerPrebuiltEtcModuleTypes, tc)
		RunBp2BuildTestCase(t, registerPrebuiltModuleTypes, tc)
		}

		func registerPrebuiltUsrShareModuleTypes(ctx android.RegistrationContext) {
		@@ -360,3 +367,30 @@ prebuilt_etc {
		ExpectedBazelTargets: []string{},
		})
		}

		func TestPrebuiltRootHostWithWildCardInSrc(t *testing.T) {
		runPrebuiltRootHostTestCase(t, Bp2buildTestCase{
		Description: "prebuilt_root_host - src string has wild card",
		Filesystem: map[string]string{
		"prh.dat": "",
		},
		Blueprint: `
		prebuilt_root_host {
		name: "prh_test",
		src: "*.dat",
		filename_from_src: true,
		relative_install_path: "test/install/path",
		bazel_module: { bp2build_available: true },
		}
		`,
		ExpectedBazelTargets: []string{
		MakeBazelTarget("prebuilt_file", "prh_test", AttrNameToString{
		"filename": `"prh.dat"`,
		"src": `"prh.dat"`,
		"dir": `"./test/install/path"`,
		"target_compatible_with": `select({
		"//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"],
		"//conditions:default": [],
		})`,
		})}})
		}

cc/config/global.go

+3 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,9 @@ var (

		// Emit additional debug info for AutoFDO
		"-fdebug-info-for-profiling",

		// Enable Hot Cold splitting optimization.
		"-mllvm -hot-cold-split=true",
		}

		commonGlobalLldflags = []string{

etc/prebuilt_etc.go

+7 −5

Original line number	Diff line number	Diff line
		@@ -508,6 +508,7 @@ func PrebuiltRootHostFactory() android.Module {
		// This module is host-only
		android.InitAndroidArchModule(module, android.HostSupported, android.MultilibCommon)
		android.InitDefaultableModule(module)
		android.InitBazelModule(module)
		return module
		}

		@@ -759,7 +760,7 @@ func (module PrebuiltEtc) Bp2buildHelper(ctx android.Bp2buildMutatorContext) (
		filename = *moduleProps.Filename
		} else if moduleProps.Filename_from_src != nil && *moduleProps.Filename_from_src {
		if moduleProps.Src != nil {
		filename = *moduleProps.Src
		filename = android.BazelLabelForModuleSrcSingle(ctx, *moduleProps.Src).Label
		}
		filenameFromSrc = true
		} else {
		@@ -767,8 +768,8 @@ func (module PrebuiltEtc) Bp2buildHelper(ctx android.Bp2buildMutatorContext) (
		}

		var dir = module.installDirBase
		if subDir := module.subdirProperties.Sub_dir; subDir != nil {
		dir = dir + "/" + *subDir
		if module.SubDir() != "" {
		dir = dir + "/" + module.SubDir()
		}

		var installable bazel.BoolAttribute
		@@ -796,8 +797,9 @@ func (module PrebuiltEtc) Bp2buildHelper(ctx android.Bp2buildMutatorContext) (
		// which we treat as PrebuiltFile
		func (module *PrebuiltEtc) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) {
		var dir = module.installDirBase
		// prebuilt_file supports only `etc` or `usr/share`
		if !(dir == "etc" \|\| dir == "usr/share") {
		// prebuilt_file only supports "etc" or "usr/share" or "." as module installDirBase
		if !(dir == "etc" \|\| dir == "usr/share" \|\| dir == ".") {
		ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_TYPE_UNSUPPORTED, "")
		return
		}