Merge "Move platform constraints to bazel_common_rules." into main (a4c330e0) · Commits · e / os / android_build_soong

bazel/configurability.go

+29 −29

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ func createPlatformArchMap() map[string]string {
		}
		result := make(map[string]string)
		for arch, allFeatures := range archFeatures {
		result[arch] = "//build/bazel/platforms/arch:" + arch
		result[arch] = "//build/bazel_common_rules/platforms/arch:" + arch
		// Sometimes we want to select on multiple features being active, so
		// add the power set of all possible features to the map. More details
		// in android.ModuleBase.GetArchVariantProperties
		@@ -160,33 +160,33 @@ var (
		// A map of target operating systems to the Bazel label of the
		// constraint_value for the @platforms//os:os constraint_setting
		platformOsMap = map[string]string{
		OsAndroid: "//build/bazel/platforms/os:android",
		OsDarwin: "//build/bazel/platforms/os:darwin",
		OsLinux: "//build/bazel/platforms/os:linux_glibc",
		osLinuxMusl: "//build/bazel/platforms/os:linux_musl",
		osLinuxBionic: "//build/bazel/platforms/os:linux_bionic",
		OsWindows: "//build/bazel/platforms/os:windows",
		OsAndroid: "//build/bazel_common_rules/platforms/os:android",
		OsDarwin: "//build/bazel_common_rules/platforms/os:darwin",
		OsLinux: "//build/bazel_common_rules/platforms/os:linux_glibc",
		osLinuxMusl: "//build/bazel_common_rules/platforms/os:linux_musl",
		osLinuxBionic: "//build/bazel_common_rules/platforms/os:linux_bionic",
		OsWindows: "//build/bazel_common_rules/platforms/os:windows",
		ConditionsDefaultConfigKey: ConditionsDefaultSelectKey, // The default condition of an os select map.
		}

		platformOsArchMap = map[string]string{
		osArchAndroidArm: "//build/bazel/platforms/os_arch:android_arm",
		OsArchAndroidArm64: "//build/bazel/platforms/os_arch:android_arm64",
		osArchAndroidRiscv64: "//build/bazel/platforms/os_arch:android_riscv64",
		osArchAndroidX86: "//build/bazel/platforms/os_arch:android_x86",
		osArchAndroidX86_64: "//build/bazel/platforms/os_arch:android_x86_64",
		osArchDarwinArm64: "//build/bazel/platforms/os_arch:darwin_arm64",
		osArchDarwinX86_64: "//build/bazel/platforms/os_arch:darwin_x86_64",
		osArchLinuxX86: "//build/bazel/platforms/os_arch:linux_glibc_x86",
		osArchLinuxX86_64: "//build/bazel/platforms/os_arch:linux_glibc_x86_64",
		osArchLinuxMuslArm: "//build/bazel/platforms/os_arch:linux_musl_arm",
		osArchLinuxMuslArm64: "//build/bazel/platforms/os_arch:linux_musl_arm64",
		osArchLinuxMuslX86: "//build/bazel/platforms/os_arch:linux_musl_x86",
		osArchLinuxMuslX86_64: "//build/bazel/platforms/os_arch:linux_musl_x86_64",
		osArchLinuxBionicArm64: "//build/bazel/platforms/os_arch:linux_bionic_arm64",
		osArchLinuxBionicX86_64: "//build/bazel/platforms/os_arch:linux_bionic_x86_64",
		osArchWindowsX86: "//build/bazel/platforms/os_arch:windows_x86",
		osArchWindowsX86_64: "//build/bazel/platforms/os_arch:windows_x86_64",
		osArchAndroidArm: "//build/bazel_common_rules/platforms/os_arch:android_arm",
		OsArchAndroidArm64: "//build/bazel_common_rules/platforms/os_arch:android_arm64",
		osArchAndroidRiscv64: "//build/bazel_common_rules/platforms/os_arch:android_riscv64",
		osArchAndroidX86: "//build/bazel_common_rules/platforms/os_arch:android_x86",
		osArchAndroidX86_64: "//build/bazel_common_rules/platforms/os_arch:android_x86_64",
		osArchDarwinArm64: "//build/bazel_common_rules/platforms/os_arch:darwin_arm64",
		osArchDarwinX86_64: "//build/bazel_common_rules/platforms/os_arch:darwin_x86_64",
		osArchLinuxX86: "//build/bazel_common_rules/platforms/os_arch:linux_glibc_x86",
		osArchLinuxX86_64: "//build/bazel_common_rules/platforms/os_arch:linux_glibc_x86_64",
		osArchLinuxMuslArm: "//build/bazel_common_rules/platforms/os_arch:linux_musl_arm",
		osArchLinuxMuslArm64: "//build/bazel_common_rules/platforms/os_arch:linux_musl_arm64",
		osArchLinuxMuslX86: "//build/bazel_common_rules/platforms/os_arch:linux_musl_x86",
		osArchLinuxMuslX86_64: "//build/bazel_common_rules/platforms/os_arch:linux_musl_x86_64",
		osArchLinuxBionicArm64: "//build/bazel_common_rules/platforms/os_arch:linux_bionic_arm64",
		osArchLinuxBionicX86_64: "//build/bazel_common_rules/platforms/os_arch:linux_bionic_x86_64",
		osArchWindowsX86: "//build/bazel_common_rules/platforms/os_arch:windows_x86",
		osArchWindowsX86_64: "//build/bazel_common_rules/platforms/os_arch:windows_x86_64",
		ConditionsDefaultConfigKey: ConditionsDefaultSelectKey, // The default condition of an os select map.
		}

		@@ -209,11 +209,11 @@ var (
		AndroidAndInApex: "//build/bazel/rules/apex:android-in_apex",
		AndroidPlatform: "//build/bazel/rules/apex:system",
		Unbundled_app: "//build/bazel/rules/apex:unbundled_app",
		OsDarwin: "//build/bazel/platforms/os:darwin",
		OsLinux: "//build/bazel/platforms/os:linux_glibc",
		osLinuxMusl: "//build/bazel/platforms/os:linux_musl",
		osLinuxBionic: "//build/bazel/platforms/os:linux_bionic",
		OsWindows: "//build/bazel/platforms/os:windows",
		OsDarwin: "//build/bazel_common_rules/platforms/os:darwin",
		OsLinux: "//build/bazel_common_rules/platforms/os:linux_glibc",
		osLinuxMusl: "//build/bazel_common_rules/platforms/os:linux_musl",
		osLinuxBionic: "//build/bazel_common_rules/platforms/os:linux_bionic",
		OsWindows: "//build/bazel_common_rules/platforms/os:windows",
		ConditionsDefaultConfigKey: ConditionsDefaultSelectKey,
		}

bp2build/aar_conversion_test.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -69,8 +69,8 @@ android_library {
		"TestLib",
		AttrNameToString{
		"srcs": `["lib.java"] + select({
		"//build/bazel/platforms/arch:arm": ["arm.java"],
		"//build/bazel/platforms/arch:x86": ["x86.java"],
		"//build/bazel_common_rules/platforms/arch:arm": ["arm.java"],
		"//build/bazel_common_rules/platforms/arch:x86": ["x86.java"],
		"//conditions:default": [],
		})`,
		"manifest": `"manifest/AndroidManifest.xml"`,

bp2build/aconfig_conversion_test.go

+4 −4

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ func TestCcAconfigLibrary(t *testing.T) {
		AttrNameToString{
		"aconfig_declarations": `":foo_aconfig_declarations"`,
		"dynamic_deps": `[":server_configurable_flags"]`,
		"target_compatible_with": `["//build/bazel/platforms/os:android"]`,
		"target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`,
		},
		)}
		RunBp2BuildTestCase(t, registerAconfigModuleTypes, Bp2buildTestCase{
		@@ -169,7 +169,7 @@ func TestJavaAconfigLibrary(t *testing.T) {
		"aconfig_declarations": `":foo_aconfig_declarations"`,
		"test": `True`,
		"sdk_version": `"system_current"`,
		"target_compatible_with": `["//build/bazel/platforms/os:android"]`,
		"target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`,
		},
		)}
		RunBp2BuildTestCase(t, registerAconfigModuleTypes, Bp2buildTestCase{
		@@ -215,7 +215,7 @@ func TestJavaAconfigLibraryAsTaggedOutput(t *testing.T) {
		"aconfig_declarations": `":foo_aconfig_declarations"`,
		"test": `True`,
		"sdk_version": `"system_current"`,
		"target_compatible_with": `["//build/bazel/platforms/os:android"]`,
		"target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`,
		},
		),
		MakeBazelTargetNoRestrictions(
		@@ -224,7 +224,7 @@ func TestJavaAconfigLibraryAsTaggedOutput(t *testing.T) {
		AttrNameToString{
		"srcs": `[":foo_aconfig_library.generated_srcjars"]`,
		"sdk_version": `"current"`,
		"target_compatible_with": `["//build/bazel/platforms/os:android"]`,
		"target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`,
		},
		),
		MakeNeverlinkDuplicateTarget("java_library", "foo_library"),

bp2build/android_app_conversion_test.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -167,8 +167,8 @@ android_app {
		ExpectedBazelTargets: []string{
		MakeBazelTarget("android_binary", "TestApp", AttrNameToString{
		"srcs": `select({
		"//build/bazel/platforms/arch:arm": ["arm.java"],
		"//build/bazel/platforms/arch:x86": ["x86.java"],
		"//build/bazel_common_rules/platforms/arch:arm": ["arm.java"],
		"//build/bazel_common_rules/platforms/arch:x86": ["x86.java"],
		"//conditions:default": [],
		})`,
		"manifest": `"AndroidManifest.xml"`,
		@@ -508,7 +508,7 @@ filegroup {
		"manifest": `"AndroidManifest.xml"`,
		"resource_files": `["res/values/attrs.xml"]`,
		"resource_zips": `["resource_zip.zip"]`,
		"target_compatible_with": `["//build/bazel/platforms/os:android"]`,
		"target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`,
		}),
		MakeBazelTargetNoRestrictions("filegroup", "framework-res-package-jar", AttrNameToString{
		"srcs": `[":framework-res.export-package.apk"]`,

bp2build/apex_conversion_test.go

+28 −28

Original line number	Diff line number	Diff line
		@@ -158,22 +158,22 @@ apex {
		"manifest": `"apogee_manifest.json"`,
		"min_sdk_version": `"29"`,
		"native_shared_libs_32": `select({
		"//build/bazel/platforms/arch:arm": [
		"//build/bazel_common_rules/platforms/arch:arm": [
		":native_shared_lib_1",
		":native_shared_lib_2",
		],
		"//build/bazel/platforms/arch:x86": [
		"//build/bazel_common_rules/platforms/arch:x86": [
		":native_shared_lib_1",
		":native_shared_lib_2",
		],
		"//conditions:default": [],
		})`,
		"native_shared_libs_64": `select({
		"//build/bazel/platforms/arch:arm64": [
		"//build/bazel_common_rules/platforms/arch:arm64": [
		":native_shared_lib_1",
		":native_shared_lib_2",
		],
		"//build/bazel/platforms/arch:x86_64": [
		"//build/bazel_common_rules/platforms/arch:x86_64": [
		":native_shared_lib_1",
		":native_shared_lib_2",
		],
		@@ -293,18 +293,18 @@ filegroup {
		":native_shared_lib_for_both",
		":native_shared_lib_for_lib32",
		] + select({
		"//build/bazel/platforms/arch:arm": [":native_shared_lib_for_first"],
		"//build/bazel/platforms/arch:x86": [":native_shared_lib_for_first"],
		"//build/bazel_common_rules/platforms/arch:arm": [":native_shared_lib_for_first"],
		"//build/bazel_common_rules/platforms/arch:x86": [":native_shared_lib_for_first"],
		"//conditions:default": [],
		})`,
		"native_shared_libs_64": `select({
		"//build/bazel/platforms/arch:arm64": [
		"//build/bazel_common_rules/platforms/arch:arm64": [
		":unnested_native_shared_lib",
		":native_shared_lib_for_both",
		":native_shared_lib_for_lib64",
		":native_shared_lib_for_first",
		],
		"//build/bazel/platforms/arch:x86_64": [
		"//build/bazel_common_rules/platforms/arch:x86_64": [
		":unnested_native_shared_lib",
		":native_shared_lib_for_both",
		":native_shared_lib_for_lib64",
		@@ -322,13 +322,13 @@ func TestApexBundleCompileMultilibFirstAndDefaultValue(t *testing.T) {
		expectedBazelTargets := []string{
		MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{
		"native_shared_libs_32": `select({
		"//build/bazel/platforms/arch:arm": [
		"//build/bazel_common_rules/platforms/arch:arm": [
		":unnested_native_shared_lib",
		":native_shared_lib_for_both",
		":native_shared_lib_for_lib32",
		":native_shared_lib_for_first",
		],
		"//build/bazel/platforms/arch:x86": [
		"//build/bazel_common_rules/platforms/arch:x86": [
		":unnested_native_shared_lib",
		":native_shared_lib_for_both",
		":native_shared_lib_for_lib32",
		@@ -337,13 +337,13 @@ func TestApexBundleCompileMultilibFirstAndDefaultValue(t *testing.T) {
		"//conditions:default": [],
		})`,
		"native_shared_libs_64": `select({
		"//build/bazel/platforms/arch:arm64": [
		"//build/bazel_common_rules/platforms/arch:arm64": [
		":unnested_native_shared_lib",
		":native_shared_lib_for_both",
		":native_shared_lib_for_lib64",
		":native_shared_lib_for_first",
		],
		"//build/bazel/platforms/arch:x86_64": [
		"//build/bazel_common_rules/platforms/arch:x86_64": [
		":unnested_native_shared_lib",
		":native_shared_lib_for_both",
		":native_shared_lib_for_lib64",
		@@ -405,8 +405,8 @@ filegroup {
		":native_shared_lib_for_both",
		":native_shared_lib_for_lib32",
		] + select({
		"//build/bazel/platforms/arch:arm": [":native_shared_lib_for_first"],
		"//build/bazel/platforms/arch:x86": [":native_shared_lib_for_first"],
		"//build/bazel_common_rules/platforms/arch:arm": [":native_shared_lib_for_first"],
		"//build/bazel_common_rules/platforms/arch:x86": [":native_shared_lib_for_first"],
		"//conditions:default": [],
		})`,
		"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,
		@@ -433,13 +433,13 @@ filegroup {
		ExpectedBazelTargets: []string{
		MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{
		"native_shared_libs_64": `select({
		"//build/bazel/platforms/arch:arm64": [
		"//build/bazel_common_rules/platforms/arch:arm64": [
		":unnested_native_shared_lib",
		":native_shared_lib_for_both",
		":native_shared_lib_for_lib64",
		":native_shared_lib_for_first",
		],
		"//build/bazel/platforms/arch:x86_64": [
		"//build/bazel_common_rules/platforms/arch:x86_64": [
		":unnested_native_shared_lib",
		":native_shared_lib_for_both",
		":native_shared_lib_for_lib64",
		@@ -671,22 +671,22 @@ override_apex {
		"manifest": `"apogee_manifest.json"`,
		"min_sdk_version": `"29"`,
		"native_shared_libs_32": `select({
		"//build/bazel/platforms/arch:arm": [
		"//build/bazel_common_rules/platforms/arch:arm": [
		":native_shared_lib_1",
		":native_shared_lib_2",
		],
		"//build/bazel/platforms/arch:x86": [
		"//build/bazel_common_rules/platforms/arch:x86": [
		":native_shared_lib_1",
		":native_shared_lib_2",
		],
		"//conditions:default": [],
		})`,
		"native_shared_libs_64": `select({
		"//build/bazel/platforms/arch:arm64": [
		"//build/bazel_common_rules/platforms/arch:arm64": [
		":native_shared_lib_1",
		":native_shared_lib_2",
		],
		"//build/bazel/platforms/arch:x86_64": [
		"//build/bazel_common_rules/platforms/arch:x86_64": [
		":native_shared_lib_1",
		":native_shared_lib_2",
		],
		@@ -796,13 +796,13 @@ override_apex {
		"manifest": `"apogee_manifest.json"`,
		"min_sdk_version": `"29"`,
		"native_shared_libs_32": `select({
		"//build/bazel/platforms/arch:arm": [":native_shared_lib_1"],
		"//build/bazel/platforms/arch:x86": [":native_shared_lib_1"],
		"//build/bazel_common_rules/platforms/arch:arm": [":native_shared_lib_1"],
		"//build/bazel_common_rules/platforms/arch:x86": [":native_shared_lib_1"],
		"//conditions:default": [],
		})`,
		"native_shared_libs_64": `select({
		"//build/bazel/platforms/arch:arm64": [":native_shared_lib_1"],
		"//build/bazel/platforms/arch:x86_64": [":native_shared_lib_1"],
		"//build/bazel_common_rules/platforms/arch:arm64": [":native_shared_lib_1"],
		"//build/bazel_common_rules/platforms/arch:x86_64": [":native_shared_lib_1"],
		"//conditions:default": [],
		})`,
		"testonly": "True",
		@@ -1298,13 +1298,13 @@ apex {
		"manifest": `"myapex_manifest.json"`,
		"binaries": `[":bar"]`,
		"native_shared_libs_32": `select({
		"//build/bazel/platforms/arch:arm": [":foo"],
		"//build/bazel/platforms/arch:x86": [":foo"],
		"//build/bazel_common_rules/platforms/arch:arm": [":foo"],
		"//build/bazel_common_rules/platforms/arch:x86": [":foo"],
		"//conditions:default": [],
		})`,
		"native_shared_libs_64": `select({
		"//build/bazel/platforms/arch:arm64": [":foo"],
		"//build/bazel/platforms/arch:x86_64": [":foo"],
		"//build/bazel_common_rules/platforms/arch:arm64": [":foo"],
		"//build/bazel_common_rules/platforms/arch:x86_64": [":foo"],
		"//conditions:default": [],
		})`,
		}),