diff options
62 files changed, 1173 insertions, 940 deletions
diff --git a/aconfig/java_aconfig_library.go b/aconfig/java_aconfig_library.go index 48cfb7695..79573c787 100644 --- a/aconfig/java_aconfig_library.go +++ b/aconfig/java_aconfig_library.go @@ -58,6 +58,8 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) DepsMutator(module *ja // Add aconfig-annotations-lib as a dependency for the optimization / code stripping annotations module.AddSharedLibrary("aconfig-annotations-lib") + // TODO(b/303773055): Remove the annotation after access issue is resolved. + module.AddSharedLibrary("unsupportedappusage") } func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuildActions(module *java.GeneratedJavaLibraryModule, ctx android.ModuleContext) android.Path { diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 16e23285a..53546114a 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -350,6 +350,8 @@ var ( "packages/modules/NetworkStack/common/captiveportal": Bp2BuildDefaultTrue, "packages/modules/NeuralNetworks/apex": Bp2BuildDefaultTrue, "packages/modules/NeuralNetworks/apex/testing": Bp2BuildDefaultTrue, + "packages/modules/SdkExtensions/gen_sdk": Bp2BuildDefaultTrue, + "packages/modules/common/proto": Bp2BuildDefaultTrue, "packages/providers/MediaProvider/tools/dialogs": Bp2BuildDefaultFalse, // TODO(b/242834374) "packages/screensavers/Basic": Bp2BuildDefaultTrue, "packages/services/Car/tests/SampleRearViewCamera": Bp2BuildDefaultFalse, // TODO(b/242834321) @@ -1088,7 +1090,7 @@ var ( "versioner", // TODO(b/228313961): depends on prebuilt shared library libclang-cpp_host as a shared library, which does not supply expected providers for a shared library // requires host tools for apexer - "apexer_test", "apexer_test_host_tools", "host_apex_verifier", + "apexer_test", "apexer_test_host_tools", "host_apex_verifier", "host-apex-verifier", // java bugs "libbase_ndk", // TODO(b/186826477): fails to link libctscamera2_jni for device (required for CtsCameraTestCases) diff --git a/android/bazel.go b/android/bazel.go index 2e16f3ea2..202fc48ed 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -634,9 +634,6 @@ func bp2buildDefaultTrueRecursively(packagePath string, config allowlists.Bp2Bui func registerBp2buildConversionMutator(ctx RegisterMutatorsContext) { ctx.BottomUp("bp2build_conversion", bp2buildConversionMutator).Parallel() -} - -func registerBp2buildDepsMutator(ctx RegisterMutatorsContext) { ctx.BottomUp("bp2build_deps", bp2buildDepsMutator).Parallel() } diff --git a/android/config.go b/android/config.go index 04b43acc6..2930c86a6 100644 --- a/android/config.go +++ b/android/config.go @@ -306,9 +306,6 @@ type config struct { // in tests when a path doesn't exist. TestAllowNonExistentPaths bool - // If true, register the "bp2build_deps" mutator in the mutator pipeline. - Bp2buildDepsMutator bool - // The list of files that when changed, must invalidate soong_build to // regenerate build.ninja. ninjaFileDepsSet sync.Map diff --git a/android/mutator.go b/android/mutator.go index 3d596554d..067d6c3df 100644 --- a/android/mutator.go +++ b/android/mutator.go @@ -35,9 +35,6 @@ import ( // RegisterMutatorsForBazelConversion is a alternate registration pipeline for bp2build. Exported for testing. func RegisterMutatorsForBazelConversion(ctx *Context, preArchMutators []RegisterMutatorFunc) { bp2buildMutators := append(preArchMutators, registerBp2buildConversionMutator) - if ctx.config.Bp2buildDepsMutator { - bp2buildMutators = append(bp2buildMutators, registerBp2buildDepsMutator) - } registerMutatorsForBazelConversion(ctx, bp2buildMutators) } diff --git a/bazel/configurability.go b/bazel/configurability.go index a28432c01..2c9a5364a 100644 --- a/bazel/configurability.go +++ b/bazel/configurability.go @@ -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, } diff --git a/bp2build/Android.bp b/bp2build/Android.bp index e30e53d86..a93fb38c8 100644 --- a/bp2build/Android.bp +++ b/bp2build/Android.bp @@ -77,6 +77,7 @@ bootstrap_go_package { "java_proto_conversion_test.go", "java_sdk_library_conversion_test.go", "java_sdk_library_import_conversion_test.go", + "java_test_host_conversion_test.go", "license_conversion_test.go", "license_kind_conversion_test.go", "linker_config_conversion_test.go", diff --git a/bp2build/aar_conversion_test.go b/bp2build/aar_conversion_test.go index 475c2d666..bdad1f4cd 100644 --- a/bp2build/aar_conversion_test.go +++ b/bp2build/aar_conversion_test.go @@ -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"`, diff --git a/bp2build/aconfig_conversion_test.go b/bp2build/aconfig_conversion_test.go index 9d73ec09c..be9a33db1 100644 --- a/bp2build/aconfig_conversion_test.go +++ b/bp2build/aconfig_conversion_test.go @@ -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"), diff --git a/bp2build/android_app_conversion_test.go b/bp2build/android_app_conversion_test.go index afe6dcd55..33d1a040d 100644 --- a/bp2build/android_app_conversion_test.go +++ b/bp2build/android_app_conversion_test.go @@ -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"]`, diff --git a/bp2build/apex_conversion_test.go b/bp2build/apex_conversion_test.go index 5871d5921..bdb655b78 100644 --- a/bp2build/apex_conversion_test.go +++ b/bp2build/apex_conversion_test.go @@ -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": [], })`, }), diff --git a/bp2build/apex_key_conversion_test.go b/bp2build/apex_key_conversion_test.go index 140afb76a..05e2f25bd 100644 --- a/bp2build/apex_key_conversion_test.go +++ b/bp2build/apex_key_conversion_test.go @@ -49,7 +49,7 @@ apex_key { ExpectedBazelTargets: []string{MakeBazelTargetNoRestrictions("apex_key", "com.android.apogee.key", AttrNameToString{ "private_key": `"com.android.apogee.pem"`, "public_key": `"com.android.apogee.avbpubkey"`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, }), }}) } @@ -72,7 +72,7 @@ apex_key { ExpectedBazelTargets: []string{MakeBazelTargetNoRestrictions("apex_key", "com.android.apogee.key", AttrNameToString{ "private_key_name": `"com.android.apogee.pem"`, "public_key_name": `"com.android.apogee.avbpubkey"`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, }), }}) } @@ -95,7 +95,7 @@ apex_key { ExpectedBazelTargets: []string{MakeBazelTargetNoRestrictions("apex_key", "com.android.apogee.key", AttrNameToString{ "private_key": `":com.android.apogee.pem"`, "public_key": `":com.android.apogee.avbpubkey"`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, }), }}) } diff --git a/bp2build/bpf_conversion_test.go b/bp2build/bpf_conversion_test.go index 1259f9e35..26b0bf434 100644 --- a/bp2build/bpf_conversion_test.go +++ b/bp2build/bpf_conversion_test.go @@ -58,7 +58,7 @@ bpf { "bpfTestSrcOne.c", "bpfTestSrcTwo.c", ]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, }), }, }) diff --git a/bp2build/build_conversion_test.go b/bp2build/build_conversion_test.go index 8e51d9803..f809bcc07 100644 --- a/bp2build/build_conversion_test.go +++ b/bp2build/build_conversion_test.go @@ -270,8 +270,8 @@ func TestGenerateBazelTargetModules(t *testing.T) { ExpectedBazelTargets: []string{ MakeBazelTarget("custom", "foo", AttrNameToString{ "string_literal_prop": `select({ - "//build/bazel/platforms/arch:arm": "ARM", - "//build/bazel/platforms/arch:arm64": "ARM64", + "//build/bazel_common_rules/platforms/arch:arm": "ARM", + "//build/bazel_common_rules/platforms/arch:arm64": "ARM64", "//conditions:default": None, })`, }), @@ -382,60 +382,60 @@ custom { ExpectedBazelTargets: []string{ MakeBazelTarget("custom", "arch_paths", AttrNameToString{ "arch_paths": `select({ - "//build/bazel/platforms/arch:arm": [ + "//build/bazel_common_rules/platforms/arch:arm": [ "arm.txt", "lib32.txt", ], - "//build/bazel/platforms/arch:arm64": [ + "//build/bazel_common_rules/platforms/arch:arm64": [ "arm64.txt", "lib64.txt", ], - "//build/bazel/platforms/arch:riscv64": [ + "//build/bazel_common_rules/platforms/arch:riscv64": [ "riscv64.txt", "lib64.txt", ], - "//build/bazel/platforms/arch:x86": [ + "//build/bazel_common_rules/platforms/arch:x86": [ "x86.txt", "lib32.txt", ], - "//build/bazel/platforms/arch:x86_64": [ + "//build/bazel_common_rules/platforms/arch:x86_64": [ "x86_64.txt", "lib64.txt", ], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:android": [ + "//build/bazel_common_rules/platforms/os:android": [ "linux.txt", "bionic.txt", "android.txt", ], - "//build/bazel/platforms/os:darwin": [ + "//build/bazel_common_rules/platforms/os:darwin": [ "host.txt", "darwin.txt", "not_windows.txt", ], - "//build/bazel/platforms/os:linux_bionic": [ + "//build/bazel_common_rules/platforms/os:linux_bionic": [ "host.txt", "linux.txt", "bionic.txt", "linux_bionic.txt", "not_windows.txt", ], - "//build/bazel/platforms/os:linux_glibc": [ + "//build/bazel_common_rules/platforms/os:linux_glibc": [ "host.txt", "linux.txt", "glibc.txt", "linux_glibc.txt", "not_windows.txt", ], - "//build/bazel/platforms/os:linux_musl": [ + "//build/bazel_common_rules/platforms/os:linux_musl": [ "host.txt", "linux.txt", "musl.txt", "linux_musl.txt", "not_windows.txt", ], - "//build/bazel/platforms/os:windows": [ + "//build/bazel_common_rules/platforms/os:windows": [ "host.txt", "windows.txt", ], @@ -467,7 +467,7 @@ custom { }), MakeBazelTarget("custom", "has_dep", AttrNameToString{ "arch_paths": `select({ - "//build/bazel/platforms/arch:x86": [":dep"], + "//build/bazel_common_rules/platforms/arch:x86": [":dep"], "//conditions:default": [], })`, }), @@ -1058,50 +1058,6 @@ func TestModuleTypeBp2Build(t *testing.T) { }), }, }, - { - Description: "depends_on_other_unconverted_module_error", - ModuleTypeUnderTest: "filegroup", - ModuleTypeUnderTestFactory: android.FileGroupFactory, - UnconvertedDepsMode: errorModulesUnconvertedDeps, - Blueprint: `filegroup { - name: "foobar", - srcs: [ - ":foo", - "c", - ], - bazel_module: { bp2build_available: true }, -}`, - ExpectedErr: fmt.Errorf(`filegroup .:foobar depends on unconverted modules: foo`), - Filesystem: map[string]string{ - "other/Android.bp": `filegroup { - name: "foo", - srcs: ["a", "b"], -}`, - }, - }, - { - Description: "depends_on_other_missing_module_error", - ModuleTypeUnderTest: "filegroup", - ModuleTypeUnderTestFactory: android.FileGroupFactory, - UnconvertedDepsMode: errorModulesUnconvertedDeps, - Blueprint: `filegroup { - name: "foobar", - srcs: [ - "c", - "//other:foo", - "//other:goo", - ], - bazel_module: { bp2build_available: true }, -}`, - ExpectedErr: fmt.Errorf(`filegroup .:foobar depends on missing modules: //other:goo`), - Filesystem: map[string]string{"other/Android.bp": `filegroup { - name: "foo", - srcs: ["a"], - bazel_module: { bp2build_available: true }, -} -`, - }, - }, } for _, testCase := range testCases { @@ -1812,8 +1768,8 @@ python_library { ExpectedBazelTargets: []string{ MakeBazelTarget("py_library", "fg_foo", map[string]string{ "data": `select({ - "//build/bazel/platforms/arch:arm": [":reqdarm"], - "//build/bazel/platforms/arch:x86": [":reqdx86"], + "//build/bazel_common_rules/platforms/arch:arm": [":reqdarm"], + "//build/bazel_common_rules/platforms/arch:x86": [":reqdx86"], "//conditions:default": [], })`, "srcs_version": `"PY3"`, @@ -2119,7 +2075,6 @@ func TestBp2buildDepsMutator_missingTransitiveDep(t *testing.T) { Blueprint: bp, ExpectedBazelTargets: expectedBazelTargets, Description: "Skipping conversion of a target with missing transitive dep", - DepsMutator: true, }) } @@ -2157,7 +2112,6 @@ func TestBp2buildDepsMutator_missingDirectDep(t *testing.T) { Blueprint: bp, ExpectedBazelTargets: expectedBazelTargets, Description: "Skipping conversion of a target with missing direct dep", - DepsMutator: true, }) } @@ -2180,7 +2134,6 @@ func TestBp2buildDepsMutator_unconvertedDirectDep(t *testing.T) { Blueprint: bp, ExpectedBazelTargets: []string{}, Description: "Skipping conversion of a target with unconverted direct dep", - DepsMutator: true, }) } @@ -2219,7 +2172,6 @@ func TestBp2buildDepsMutator_unconvertedTransitiveDep(t *testing.T) { Blueprint: bp, ExpectedBazelTargets: expectedBazelTargets, Description: "Skipping conversion of a target with unconverted transitive dep", - DepsMutator: true, }) } @@ -2259,7 +2211,6 @@ func TestBp2buildDepsMutator_alreadyExistsBuildDeps(t *testing.T) { Blueprint: bp, ExpectedBazelTargets: expectedBazelTargets, Description: "Convert target with already-existing build dep", - DepsMutator: true, }) } @@ -2301,6 +2252,5 @@ func TestBp2buildDepsMutator_depOnLibc(t *testing.T) { Blueprint: bp, ExpectedBazelTargets: expectedBazelTargets, Description: "Convert target with dep on libc", - DepsMutator: true, }) } diff --git a/bp2build/cc_binary_conversion_test.go b/bp2build/cc_binary_conversion_test.go index c67970375..2857a91df 100644 --- a/bp2build/cc_binary_conversion_test.go +++ b/bp2build/cc_binary_conversion_test.go @@ -618,13 +618,13 @@ cc_library { {"cc_library_static", "bar_bp2build_cc_library_static", AttrNameToString{ "local_includes": `["."]`, "srcs": `["b.cc"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, }, }, {"cc_library_shared", "bar", AttrNameToString{ "local_includes": `["."]`, "srcs": `["b.cc"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, }, }, {"cc_binary", "foo", AttrNameToString{ @@ -653,7 +653,7 @@ func TestCcBinaryWithInstructionSet(t *testing.T) { targets: []testBazelTarget{ {"cc_binary", "foo", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/arch:arm": ["arm_isa_arm"], + "//build/bazel_common_rules/platforms/arch:arm": ["arm_isa_arm"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -713,8 +713,8 @@ func TestCcArchVariantBinarySuffix(t *testing.T) { {"cc_binary", "foo", AttrNameToString{ "local_includes": `["."]`, "suffix": `select({ - "//build/bazel/platforms/arch:arm": "-32", - "//build/bazel/platforms/arch:arm64": "-64", + "//build/bazel_common_rules/platforms/arch:arm": "-32", + "//build/bazel_common_rules/platforms/arch:arm64": "-64", "//conditions:default": None, })`, }}, @@ -775,7 +775,7 @@ func TestCcBinaryWithSyspropSrcsSomeConfigs(t *testing.T) { targets: []testBazelTarget{ {"sysprop_library", "foo_sysprop_library", AttrNameToString{ "srcs": `select({ - "//build/bazel/platforms/os:android": ["bar.sysprop"], + "//build/bazel_common_rules/platforms/os:android": ["bar.sysprop"], "//conditions:default": [], })`, }}, @@ -788,7 +788,7 @@ func TestCcBinaryWithSyspropSrcsSomeConfigs(t *testing.T) { "local_includes": `["."]`, "min_sdk_version": `"5"`, "whole_archive_deps": `select({ - "//build/bazel/platforms/os:android": [":foo_cc_sysprop_library_static"], + "//build/bazel_common_rules/platforms/os:android": [":foo_cc_sysprop_library_static"], "//conditions:default": [], })`, }}, @@ -866,8 +866,8 @@ func TestCcBinaryWithUBSanPropertiesArchSpecific(t *testing.T) { "ubsan_undefined", "ubsan_nullability", ] + select({ - "//build/bazel/platforms/os:android": ["ubsan_alignment"], - "//build/bazel/platforms/os:linux_glibc": ["ubsan_integer_overflow"], + "//build/bazel_common_rules/platforms/os:android": ["ubsan_alignment"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["ubsan_integer_overflow"], "//conditions:default": [], })`, }}, @@ -964,11 +964,11 @@ func TestCcBinaryWithThinLtoArchSpecific(t *testing.T) { {"cc_binary", "foo", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_arm64": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_riscv64": ["-android_thin_lto"], - "//build/bazel/platforms/os_arch:android_x86": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_x86_64": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_arm": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_arm64": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_riscv64": ["-android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_x86": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_x86_64": ["android_thin_lto"], "//conditions:default": [], })`, }}, @@ -998,7 +998,7 @@ func TestCcBinaryWithThinLtoDisabledDefaultEnabledVariant(t *testing.T) { {"cc_binary", "foo", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os:android": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os:android": ["android_thin_lto"], "//conditions:default": ["-android_thin_lto"], })`, }}, @@ -1062,7 +1062,7 @@ func TestCcBinaryHiddenVisibilityConvertedToFeatureOsSpecific(t *testing.T) { {"cc_binary", "foo", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os:android": ["visibility_hidden"], + "//build/bazel_common_rules/platforms/os:android": ["visibility_hidden"], "//conditions:default": [], })`, }}, @@ -1106,7 +1106,7 @@ func TestCcBinaryWithCfiOsSpecific(t *testing.T) { targets: []testBazelTarget{ {"cc_binary", "foo", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/os:android": ["android_cfi"], + "//build/bazel_common_rules/platforms/os:android": ["android_cfi"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -1187,8 +1187,8 @@ cc_binary { }}, {"cc_binary", "foo_with_arch_variant_stem", AttrNameToString{ "stem": `select({ - "//build/bazel/platforms/arch:arm": "foo-arm", - "//build/bazel/platforms/arch:arm64": "foo-arm64", + "//build/bazel_common_rules/platforms/arch:arm": "foo-arm", + "//build/bazel_common_rules/platforms/arch:arm64": "foo-arm64", "//conditions:default": None, })`, "local_includes": `["."]`, diff --git a/bp2build/cc_library_conversion_test.go b/bp2build/cc_library_conversion_test.go index d19859645..188c81b2a 100644 --- a/bp2build/cc_library_conversion_test.go +++ b/bp2build/cc_library_conversion_test.go @@ -137,22 +137,22 @@ cc_library { "export_includes": `["foo-dir"]`, "implementation_deps": `[":some-headers"]`, "linkopts": `["-Wl,--exclude-libs=bar.a"] + select({ - "//build/bazel/platforms/arch:x86": ["-Wl,--exclude-libs=baz.a"], - "//build/bazel/platforms/arch:x86_64": ["-Wl,--exclude-libs=qux.a"], + "//build/bazel_common_rules/platforms/arch:x86": ["-Wl,--exclude-libs=baz.a"], + "//build/bazel_common_rules/platforms/arch:x86_64": ["-Wl,--exclude-libs=qux.a"], "//conditions:default": [], })`, "srcs": `["impl.cpp"] + select({ - "//build/bazel/platforms/arch:x86": ["x86.cpp"], - "//build/bazel/platforms/arch:x86_64": ["x86_64.cpp"], + "//build/bazel_common_rules/platforms/arch:x86": ["x86.cpp"], + "//build/bazel_common_rules/platforms/arch:x86_64": ["x86_64.cpp"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:android": [ + "//build/bazel_common_rules/platforms/os:android": [ "bionic.cpp", "android.cpp", ], - "//build/bazel/platforms/os:darwin": ["darwin.cpp"], - "//build/bazel/platforms/os:linux_bionic": ["bionic.cpp"], - "//build/bazel/platforms/os:linux_glibc": ["linux.cpp"], + "//build/bazel_common_rules/platforms/os:darwin": ["darwin.cpp"], + "//build/bazel_common_rules/platforms/os:linux_bionic": ["bionic.cpp"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["linux.cpp"], "//conditions:default": [], })`, "sdk_version": `"current"`, @@ -228,8 +228,8 @@ cc_library { "-Wl,--exclude-libs=libclang_rt.builtins-i686-android.a", "-Wl,--exclude-libs=libclang_rt.builtins-x86_64-android.a", ] + select({ - "//build/bazel/platforms/arch:x86": ["-Wl,--exclude-libs=libgcc_eh.a"], - "//build/bazel/platforms/arch:x86_64": ["-Wl,--exclude-libs=libgcc_eh.a"], + "//build/bazel_common_rules/platforms/arch:x86": ["-Wl,--exclude-libs=libgcc_eh.a"], + "//build/bazel_common_rules/platforms/arch:x86_64": ["-Wl,--exclude-libs=libgcc_eh.a"], "//conditions:default": [], })`, }), @@ -278,7 +278,7 @@ cc_library { Blueprint: soongCcLibraryPreamble, ExpectedBazelTargets: makeCcLibraryTargets("fake-libarm-optimized-routines-math", AttrNameToString{ "copts": `select({ - "//build/bazel/platforms/arch:arm64": ["-DHAVE_FAST_FMA=1"], + "//build/bazel_common_rules/platforms/arch:arm64": ["-DHAVE_FAST_FMA=1"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -688,14 +688,14 @@ cc_library_static { name: "android_dep_for_shared" } "bothflag", "staticflag", ] + select({ - "//build/bazel/platforms/arch:x86": ["-DX86_STATIC"], + "//build/bazel_common_rules/platforms/arch:x86": ["-DX86_STATIC"], "//conditions:default": [], })`, "implementation_deps": `[ ":static_dep_for_both", ":static_dep_for_static", ] + select({ - "//build/bazel/platforms/arch:x86": [":x86_dep_for_static"], + "//build/bazel_common_rules/platforms/arch:x86": [":x86_dep_for_static"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -703,7 +703,7 @@ cc_library_static { name: "android_dep_for_shared" } "both.cpp", "staticonly.cpp", ] + select({ - "//build/bazel/platforms/arch:x86": ["x86_static.cpp"], + "//build/bazel_common_rules/platforms/arch:x86": ["x86_static.cpp"], "//conditions:default": [], })`, }), @@ -712,27 +712,27 @@ cc_library_static { name: "android_dep_for_shared" } "bothflag", "sharedflag", ] + select({ - "//build/bazel/platforms/arch:arm": ["-DARM_SHARED"], + "//build/bazel_common_rules/platforms/arch:arm": ["-DARM_SHARED"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:android": ["-DANDROID_SHARED"], + "//build/bazel_common_rules/platforms/os:android": ["-DANDROID_SHARED"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os_arch:android_arm": ["-DANDROID_ARM_SHARED"], + "//build/bazel_common_rules/platforms/os_arch:android_arm": ["-DANDROID_ARM_SHARED"], "//conditions:default": [], })`, "implementation_deps": `[ ":static_dep_for_both", ":static_dep_for_shared", ] + select({ - "//build/bazel/platforms/arch:arm": [":arm_static_dep_for_shared"], + "//build/bazel_common_rules/platforms/arch:arm": [":arm_static_dep_for_shared"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:android": [":android_dep_for_shared"], + "//build/bazel_common_rules/platforms/os:android": [":android_dep_for_shared"], "//conditions:default": [], })`, "implementation_dynamic_deps": `select({ - "//build/bazel/platforms/arch:arm": [":arm_shared_dep_for_shared"], + "//build/bazel_common_rules/platforms/arch:arm": [":arm_shared_dep_for_shared"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -740,14 +740,14 @@ cc_library_static { name: "android_dep_for_shared" } "both.cpp", "sharedonly.cpp", ] + select({ - "//build/bazel/platforms/arch:arm": ["arm_shared.cpp"], + "//build/bazel_common_rules/platforms/arch:arm": ["arm_shared.cpp"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:android": ["android_shared.cpp"], + "//build/bazel_common_rules/platforms/os:android": ["android_shared.cpp"], "//conditions:default": [], })`, "whole_archive_deps": `select({ - "//build/bazel/platforms/arch:arm": [":arm_whole_static_dep_for_shared"], + "//build/bazel_common_rules/platforms/arch:arm": [":arm_whole_static_dep_for_shared"], "//conditions:default": [], })`, }), @@ -954,22 +954,22 @@ cc_library { Blueprint: soongCcLibraryPreamble, ExpectedBazelTargets: makeCcLibraryTargets("a", AttrNameToString{ "additional_linker_inputs": `select({ - "//build/bazel/platforms/arch:arm": [ + "//build/bazel_common_rules/platforms/arch:arm": [ "arm.map", "dynamic_arm.list", ], - "//build/bazel/platforms/arch:arm64": [ + "//build/bazel_common_rules/platforms/arch:arm64": [ "arm64.map", "dynamic_arm64.list", ], "//conditions:default": [], })`, "linkopts": `select({ - "//build/bazel/platforms/arch:arm": [ + "//build/bazel_common_rules/platforms/arch:arm": [ "-Wl,--version-script,$(location arm.map)", "-Wl,--dynamic-list,$(location dynamic_arm.list)", ], - "//build/bazel/platforms/arch:arm64": [ + "//build/bazel_common_rules/platforms/arch:arm64": [ "-Wl,--version-script,$(location arm64.map)", "-Wl,--dynamic-list,$(location dynamic_arm64.list)", ], @@ -977,8 +977,8 @@ cc_library { })`, "srcs": `["a.cpp"]`, "features": `select({ - "//build/bazel/platforms/arch:arm": ["android_cfi_exports_map"], - "//build/bazel/platforms/arch:arm64": ["android_cfi_exports_map"], + "//build/bazel_common_rules/platforms/arch:arm": ["android_cfi_exports_map"], + "//build/bazel_common_rules/platforms/arch:arm64": ["android_cfi_exports_map"], "//conditions:default": [], })`, }), @@ -1065,7 +1065,7 @@ func TestCcLibraryFeatures(t *testing.T) { })...) expected_targets = append(expected_targets, makeCcLibraryTargets("b", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/arch:x86_64": [ + "//build/bazel_common_rules/platforms/arch:x86_64": [ "disable_pack_relocations", "-no_undefined_symbols", ], @@ -1076,7 +1076,7 @@ func TestCcLibraryFeatures(t *testing.T) { })...) expected_targets = append(expected_targets, makeCcLibraryTargets("c", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/os:darwin": [ + "//build/bazel_common_rules/platforms/os:darwin": [ "disable_pack_relocations", "-no_undefined_symbols", ], @@ -1181,10 +1181,10 @@ func TestCcLibraryCppFlagsGoesIntoCopts(t *testing.T) { "-fsigned-char", "-pedantic", ] + select({ - "//build/bazel/platforms/arch:arm64": ["-DARM64=1"], + "//build/bazel_common_rules/platforms/arch:arm64": ["-DARM64=1"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:android": ["-DANDROID=1"], + "//build/bazel_common_rules/platforms/os:android": ["-DANDROID=1"], "//conditions:default": [], })`, "srcs": `["a.cpp"]`, @@ -1271,14 +1271,14 @@ cc_library { `, ExpectedBazelTargets: makeCcLibraryTargets("foo_static", AttrNameToString{ "implementation_deps": `select({ - "//build/bazel/platforms/arch:arm": [], + "//build/bazel_common_rules/platforms/arch:arm": [], "//conditions:default": [":arm_static_lib_excludes_bp2build_cc_library_static"], }) + select({ "//build/bazel/product_config/config_settings:malloc_not_svelte": [], "//conditions:default": [":malloc_not_svelte_static_lib_excludes_bp2build_cc_library_static"], })`, "implementation_dynamic_deps": `select({ - "//build/bazel/platforms/arch:arm": [], + "//build/bazel_common_rules/platforms/arch:arm": [], "//conditions:default": [":arm_shared_lib_excludes"], }) + select({ "//build/bazel/product_config/config_settings:malloc_not_svelte": [":malloc_not_svelte_shared_lib"], @@ -1286,7 +1286,7 @@ cc_library { })`, "srcs_c": `["common.c"]`, "whole_archive_deps": `select({ - "//build/bazel/platforms/arch:arm": [], + "//build/bazel_common_rules/platforms/arch:arm": [], "//conditions:default": [":arm_whole_static_lib_excludes_bp2build_cc_library_static"], }) + select({ "//build/bazel/product_config/config_settings:malloc_not_svelte": [":malloc_not_svelte_whole_static_lib_bp2build_cc_library_static"], @@ -1325,7 +1325,7 @@ cc_library { "//conditions:default": [], })`, "srcs_c": `["common.c"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, }), }, ) @@ -1402,7 +1402,7 @@ cc_library { `, ExpectedBazelTargets: makeCcLibraryTargets("foo-lib", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/arch:arm": ["-link_crt"], + "//build/bazel_common_rules/platforms/arch:arm": ["-link_crt"], "//conditions:default": [], })`, "srcs": `["impl.cpp"]`, @@ -1506,8 +1506,8 @@ cc_library { ExpectedBazelTargets: makeCcLibraryTargets("foo-lib", AttrNameToString{ "srcs": `["impl.cpp"]`, "features": `select({ - "//build/bazel/platforms/arch:arm": ["-use_libcrt"], - "//build/bazel/platforms/arch:x86": ["-use_libcrt"], + "//build/bazel_common_rules/platforms/arch:arm": ["-use_libcrt"], + "//build/bazel_common_rules/platforms/arch:x86": ["-use_libcrt"], "//conditions:default": [], })`, }), @@ -1543,11 +1543,11 @@ cc_library { `, ExpectedBazelTargets: makeCcLibraryTargets("foo-lib", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/arch:arm": ["-use_libcrt"], - "//build/bazel/platforms/arch:x86": ["-use_libcrt"], + "//build/bazel_common_rules/platforms/arch:arm": ["-use_libcrt"], + "//build/bazel_common_rules/platforms/arch:x86": ["-use_libcrt"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:darwin": ["-use_libcrt"], + "//build/bazel_common_rules/platforms/os:darwin": ["-use_libcrt"], "//conditions:default": [], })`, "srcs": `["impl.cpp"]`, @@ -1586,8 +1586,8 @@ cc_library { ExpectedBazelTargets: makeCcLibraryTargets("foo-lib", AttrNameToString{ "srcs": `["impl.cpp"]`, "features": `select({ - "//build/bazel/platforms/arch:arm": ["-use_libcrt"], - "//build/bazel/platforms/arch:x86_64": ["-use_libcrt"], + "//build/bazel_common_rules/platforms/arch:arm": ["-use_libcrt"], + "//build/bazel_common_rules/platforms/arch:x86_64": ["-use_libcrt"], "//conditions:default": [], })`, }), @@ -1705,15 +1705,15 @@ cc_library { ExpectedBazelTargets: makeCcLibraryTargets("multi-arch", AttrNameToString{ "strip": `{ "keep_symbols": select({ - "//build/bazel/platforms/arch:arm64": True, + "//build/bazel_common_rules/platforms/arch:arm64": True, "//conditions:default": None, }), "keep_symbols_and_debug_frame": select({ - "//build/bazel/platforms/arch:arm": True, + "//build/bazel_common_rules/platforms/arch:arm": True, "//conditions:default": None, }), "keep_symbols_list": select({ - "//build/bazel/platforms/os:darwin": [ + "//build/bazel_common_rules/platforms/os:darwin": [ "foo", "bar", ], @@ -1844,7 +1844,7 @@ cc_library { `, ExpectedBazelTargets: makeCcLibraryTargets("target_linux_bionic_empty", AttrNameToString{ "system_dynamic_deps": `select({ - "//build/bazel/platforms/os:linux_musl": [":libc_musl"], + "//build/bazel_common_rules/platforms/os:linux_musl": [":libc_musl"], "//conditions:default": [], })`, }), @@ -1875,7 +1875,7 @@ cc_library { `, ExpectedBazelTargets: makeCcLibraryTargets("target_bionic_empty", AttrNameToString{ "system_dynamic_deps": `select({ - "//build/bazel/platforms/os:linux_musl": [":libc_musl"], + "//build/bazel_common_rules/platforms/os:linux_musl": [":libc_musl"], "//conditions:default": [], })`, }), @@ -2011,25 +2011,25 @@ cc_library { `, ExpectedBazelTargets: makeCcLibraryTargets("foo-lib", AttrNameToString{ "srcs": `["base.cpp"] + select({ - "//build/bazel/platforms/os:android": [ + "//build/bazel_common_rules/platforms/os:android": [ "linux.cpp", "bionic.cpp", "android.cpp", ], - "//build/bazel/platforms/os:darwin": ["darwin.cpp"], - "//build/bazel/platforms/os:linux_bionic": [ + "//build/bazel_common_rules/platforms/os:darwin": ["darwin.cpp"], + "//build/bazel_common_rules/platforms/os:linux_bionic": [ "linux.cpp", "bionic.cpp", ], - "//build/bazel/platforms/os:linux_glibc": [ + "//build/bazel_common_rules/platforms/os:linux_glibc": [ "linux.cpp", "linux_glibc.cpp", ], - "//build/bazel/platforms/os:linux_musl": [ + "//build/bazel_common_rules/platforms/os:linux_musl": [ "linux.cpp", "linux_musl.cpp", ], - "//build/bazel/platforms/os:windows": ["windows.cpp"], + "//build/bazel_common_rules/platforms/os:windows": ["windows.cpp"], "//conditions:default": [], })`, }), @@ -2056,7 +2056,7 @@ cc_library { `, ExpectedBazelTargets: makeCcLibraryTargets("libcrypto", AttrNameToString{ "inject_bssl_hash": `select({ - "//build/bazel/platforms/os:android": True, + "//build/bazel_common_rules/platforms/os:android": True, "//conditions:default": None, })`, }), @@ -2697,11 +2697,11 @@ func TestCcLibraryDisabledArchAndTarget(t *testing.T) { ExpectedBazelTargets: makeCcLibraryTargets("foo", AttrNameToString{ "srcs": `["foo.cpp"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os_arch:darwin_arm64": ["@platforms//:incompatible"], - "//build/bazel/platforms/os_arch:darwin_x86_64": ["@platforms//:incompatible"], - "//build/bazel/platforms/os_arch:linux_glibc_x86": ["@platforms//:incompatible"], - "//build/bazel/platforms/os_arch:windows_x86": ["@platforms//:incompatible"], - "//build/bazel/platforms/os_arch:windows_x86_64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:darwin_arm64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:darwin_x86_64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:linux_glibc_x86": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:windows_x86": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:windows_x86_64": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -2733,8 +2733,8 @@ func TestCcLibraryDisabledArchAndTargetWithDefault(t *testing.T) { ExpectedBazelTargets: makeCcLibraryTargets("foo", AttrNameToString{ "srcs": `["foo.cpp"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os_arch:darwin_arm64": [], - "//build/bazel/platforms/os_arch:darwin_x86_64": [], + "//build/bazel_common_rules/platforms/os_arch:darwin_arm64": [], + "//build/bazel_common_rules/platforms/os_arch:darwin_x86_64": [], "//conditions:default": ["@platforms//:incompatible"], })`, }), @@ -2767,7 +2767,7 @@ func TestCcLibrarySharedDisabled(t *testing.T) { }), MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "srcs": `["foo.cpp"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -2804,15 +2804,15 @@ func TestCcLibraryStaticDisabledForSomeArch(t *testing.T) { ExpectedBazelTargets: []string{MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{ "srcs": `["foo.cpp"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:windows": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:windows": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "srcs": `["foo.cpp"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os_arch:darwin_arm64": [], - "//build/bazel/platforms/os_arch:darwin_x86_64": [], - "//build/bazel/platforms/os_arch:linux_glibc_x86": [], + "//build/bazel_common_rules/platforms/os_arch:darwin_arm64": [], + "//build/bazel_common_rules/platforms/os_arch:darwin_x86_64": [], + "//build/bazel_common_rules/platforms/os_arch:linux_glibc_x86": [], "//conditions:default": ["@platforms//:incompatible"], })`, }), @@ -2923,22 +2923,22 @@ cc_library { }`, ExpectedBazelTargets: makeCcLibraryTargets("foolib", AttrNameToString{ "implementation_dynamic_deps": `select({ - "//build/bazel/platforms/os:darwin": [":bazlib"], - "//build/bazel/platforms/os:linux_bionic": [":bazlib"], - "//build/bazel/platforms/os:linux_glibc": [":bazlib"], - "//build/bazel/platforms/os:linux_musl": [":bazlib"], - "//build/bazel/platforms/os:windows": [":bazlib"], + "//build/bazel_common_rules/platforms/os:darwin": [":bazlib"], + "//build/bazel_common_rules/platforms/os:linux_bionic": [":bazlib"], + "//build/bazel_common_rules/platforms/os:linux_glibc": [":bazlib"], + "//build/bazel_common_rules/platforms/os:linux_musl": [":bazlib"], + "//build/bazel_common_rules/platforms/os:windows": [":bazlib"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:darwin": [":quxlib"], - "//build/bazel/platforms/os:linux_bionic": [":quxlib"], - "//build/bazel/platforms/os:linux_glibc": [":quxlib"], - "//build/bazel/platforms/os:linux_musl": [":quxlib"], - "//build/bazel/platforms/os:windows": [":quxlib"], "//build/bazel/rules/apex:foo": [ "@api_surfaces//module-libapi/current:barlib", "@api_surfaces//module-libapi/current:quxlib", ], + "//build/bazel_common_rules/platforms/os:darwin": [":quxlib"], + "//build/bazel_common_rules/platforms/os:linux_bionic": [":quxlib"], + "//build/bazel_common_rules/platforms/os:linux_glibc": [":quxlib"], + "//build/bazel_common_rules/platforms/os:linux_musl": [":quxlib"], + "//build/bazel_common_rules/platforms/os:windows": [":quxlib"], "//conditions:default": [ ":barlib", ":quxlib", @@ -3053,7 +3053,7 @@ func TestCcLibraryWithInstructionSet(t *testing.T) { `, ExpectedBazelTargets: makeCcLibraryTargets("foo", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/arch:arm": ["arm_isa_arm"], + "//build/bazel_common_rules/platforms/arch:arm": ["arm_isa_arm"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -3137,8 +3137,8 @@ func TestCcLibraryArchVariantSuffix(t *testing.T) { MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "srcs_c": `["foo.c"]`, "suffix": `select({ - "//build/bazel/platforms/arch:arm": "-32", - "//build/bazel/platforms/arch:arm64": "-64", + "//build/bazel_common_rules/platforms/arch:arm": "-32", + "//build/bazel_common_rules/platforms/arch:arm64": "-64", "//conditions:default": None, })`, }), @@ -3503,7 +3503,7 @@ cc_library { ExpectedBazelTargets: []string{ MakeBazelTargetNoRestrictions("sysprop_library", "foo_sysprop_library", AttrNameToString{ "srcs": `select({ - "//build/bazel/platforms/os:android": ["bar.sysprop"], + "//build/bazel_common_rules/platforms/os:android": ["bar.sysprop"], "//conditions:default": [], })`, }), @@ -3516,7 +3516,7 @@ cc_library { "local_includes": `["."]`, "min_sdk_version": `"5"`, "whole_archive_deps": `select({ - "//build/bazel/platforms/os:android": [":foo_cc_sysprop_library_static"], + "//build/bazel_common_rules/platforms/os:android": [":foo_cc_sysprop_library_static"], "//conditions:default": [], })`, }), @@ -3525,7 +3525,7 @@ cc_library { "local_includes": `["."]`, "min_sdk_version": `"5"`, "whole_archive_deps": `select({ - "//build/bazel/platforms/os:android": [":foo_cc_sysprop_library_static"], + "//build/bazel_common_rules/platforms/os:android": [":foo_cc_sysprop_library_static"], "//conditions:default": [], })`, }), @@ -3861,39 +3861,39 @@ cc_library { `, ExpectedBazelTargets: makeCcLibraryTargets("a", AttrNameToString{ "export_includes": `select({ - "//build/bazel/platforms/os_arch:android_arm": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm": [ "android_arm_eid1", "android_arm_eid2", ], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:android": [ + "//build/bazel_common_rules/platforms/os:android": [ "android_eid1", "android_eid2", "linux_eid1", "linux_eid2", ], - "//build/bazel/platforms/os:linux_bionic": [ + "//build/bazel_common_rules/platforms/os:linux_bionic": [ "linux_eid1", "linux_eid2", ], - "//build/bazel/platforms/os:linux_glibc": [ + "//build/bazel_common_rules/platforms/os:linux_glibc": [ "linux_eid1", "linux_eid2", ], - "//build/bazel/platforms/os:linux_musl": [ + "//build/bazel_common_rules/platforms/os:linux_musl": [ "linux_eid1", "linux_eid2", ], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/arch:arm": [ + "//build/bazel_common_rules/platforms/arch:arm": [ "lib32_eid1", "lib32_eid2", "arm_eid1", "arm_eid2", ], - "//build/bazel/platforms/arch:x86": [ + "//build/bazel_common_rules/platforms/arch:x86": [ "lib32_eid1", "lib32_eid2", ], @@ -3903,39 +3903,39 @@ cc_library { "eid2", ]`, "export_system_includes": `select({ - "//build/bazel/platforms/os_arch:android_arm": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm": [ "android_arm_esid1", "android_arm_esid2", ], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:android": [ + "//build/bazel_common_rules/platforms/os:android": [ "android_esid1", "android_esid2", "linux_esid1", "linux_esid2", ], - "//build/bazel/platforms/os:linux_bionic": [ + "//build/bazel_common_rules/platforms/os:linux_bionic": [ "linux_esid1", "linux_esid2", ], - "//build/bazel/platforms/os:linux_glibc": [ + "//build/bazel_common_rules/platforms/os:linux_glibc": [ "linux_esid1", "linux_esid2", ], - "//build/bazel/platforms/os:linux_musl": [ + "//build/bazel_common_rules/platforms/os:linux_musl": [ "linux_esid1", "linux_esid2", ], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/arch:arm": [ + "//build/bazel_common_rules/platforms/arch:arm": [ "lib32_esid1", "lib32_esid2", "arm_esid1", "arm_esid2", ], - "//build/bazel/platforms/arch:x86": [ + "//build/bazel_common_rules/platforms/arch:x86": [ "lib32_esid1", "lib32_esid2", ], @@ -3946,7 +3946,7 @@ cc_library { ]`, "srcs": `["a.cpp"]`, "local_includes": `["."]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, }), }, ) @@ -4081,8 +4081,8 @@ cc_library { "ubsan_undefined", "ubsan_nullability", ] + select({ - "//build/bazel/platforms/os:android": ["ubsan_alignment"], - "//build/bazel/platforms/os:linux_glibc": ["ubsan_integer_overflow"], + "//build/bazel_common_rules/platforms/os:android": ["ubsan_alignment"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["ubsan_integer_overflow"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -4092,8 +4092,8 @@ cc_library { "ubsan_undefined", "ubsan_nullability", ] + select({ - "//build/bazel/platforms/os:android": ["ubsan_alignment"], - "//build/bazel/platforms/os:linux_glibc": ["ubsan_integer_overflow"], + "//build/bazel_common_rules/platforms/os:android": ["ubsan_alignment"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["ubsan_integer_overflow"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -4221,21 +4221,21 @@ cc_library { MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_arm64": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_riscv64": ["-android_thin_lto"], - "//build/bazel/platforms/os_arch:android_x86": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_x86_64": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_arm": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_arm64": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_riscv64": ["-android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_x86": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_x86_64": ["android_thin_lto"], "//conditions:default": [], })`}), MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_arm64": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_riscv64": ["-android_thin_lto"], - "//build/bazel/platforms/os_arch:android_x86": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_x86_64": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_arm": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_arm64": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_riscv64": ["-android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_x86": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_x86_64": ["android_thin_lto"], "//conditions:default": [], })`}), }, @@ -4266,14 +4266,14 @@ cc_library { MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os:android": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os:android": ["android_thin_lto"], "//conditions:default": ["-android_thin_lto"], })`, }), MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os:android": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os:android": ["android_thin_lto"], "//conditions:default": ["-android_thin_lto"], })`, }), @@ -4401,14 +4401,14 @@ cc_library { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/os:android": ["visibility_hidden"], + "//build/bazel_common_rules/platforms/os:android": ["visibility_hidden"], "//conditions:default": [], })`, "local_includes": `["."]`, }), MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/os:android": ["visibility_hidden"], + "//build/bazel_common_rules/platforms/os:android": ["visibility_hidden"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -4440,7 +4440,7 @@ cc_library { "flag_values": `{ "//build/bazel/rules/apex:api_domain": "myapex", }`, - "constraint_values": `["//build/bazel/platforms/os:android"]`, + "constraint_values": `["//build/bazel_common_rules/platforms/os:android"]`, }, ), }, @@ -4574,12 +4574,12 @@ func TestCcLibraryHostLdLibs(t *testing.T) { ExpectedBazelTargets: []string{ MakeBazelTargetNoRestrictions("cc_binary", "a", AttrNameToString{ "linkopts": `["-lcommon"] + select({ - "//build/bazel/platforms/os:darwin": [ + "//build/bazel_common_rules/platforms/os:darwin": [ "-ldarwinadditional", "-ldarwin", ], - "//build/bazel/platforms/os:linux_glibc": ["-llinux"], - "//build/bazel/platforms/os:windows": ["-lwindows"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["-llinux"], + "//build/bazel_common_rules/platforms/os:windows": ["-lwindows"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -4632,14 +4632,14 @@ cc_library { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/os:android": ["android_cfi"], + "//build/bazel_common_rules/platforms/os:android": ["android_cfi"], "//conditions:default": [], })`, "local_includes": `["."]`, }), MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/os:android": ["android_cfi"], + "//build/bazel_common_rules/platforms/os:android": ["android_cfi"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -4737,8 +4737,8 @@ cc_library_shared { }), MakeBazelTarget("cc_library_shared", "foo_with_arch_variant_stem", AttrNameToString{ "stem": `select({ - "//build/bazel/platforms/arch:arm": "foo-arm", - "//build/bazel/platforms/arch:arm64": "foo-arm64", + "//build/bazel_common_rules/platforms/arch:arm": "foo-arm", + "//build/bazel_common_rules/platforms/arch:arm64": "foo-arm64", "//conditions:default": None, })`, "local_includes": `["."]`, @@ -5122,35 +5122,35 @@ cc_library { ExpectedBazelTargets: []string{ MakeBazelTargetNoRestrictions("cc_library_shared", "lib32", AttrNameToString{ "local_includes": `["."]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"] + select({ - "//build/bazel/platforms/arch:arm64": ["@platforms//:incompatible"], - "//build/bazel/platforms/arch:riscv64": ["@platforms//:incompatible"], - "//build/bazel/platforms/arch:x86_64": ["@platforms//:incompatible"], + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"] + select({ + "//build/bazel_common_rules/platforms/arch:arm64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/arch:riscv64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/arch:x86_64": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), MakeBazelTargetNoRestrictions("cc_library_static", "lib32_bp2build_cc_library_static", AttrNameToString{ "local_includes": `["."]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"] + select({ - "//build/bazel/platforms/arch:arm64": ["@platforms//:incompatible"], - "//build/bazel/platforms/arch:riscv64": ["@platforms//:incompatible"], - "//build/bazel/platforms/arch:x86_64": ["@platforms//:incompatible"], + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"] + select({ + "//build/bazel_common_rules/platforms/arch:arm64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/arch:riscv64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/arch:x86_64": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), MakeBazelTargetNoRestrictions("cc_library_shared", "lib64", AttrNameToString{ "local_includes": `["."]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"] + select({ - "//build/bazel/platforms/arch:arm": ["@platforms//:incompatible"], - "//build/bazel/platforms/arch:x86": ["@platforms//:incompatible"], + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"] + select({ + "//build/bazel_common_rules/platforms/arch:arm": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/arch:x86": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), MakeBazelTargetNoRestrictions("cc_library_static", "lib64_bp2build_cc_library_static", AttrNameToString{ "local_includes": `["."]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"] + select({ - "//build/bazel/platforms/arch:arm": ["@platforms//:incompatible"], - "//build/bazel/platforms/arch:x86": ["@platforms//:incompatible"], + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"] + select({ + "//build/bazel_common_rules/platforms/arch:arm": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/arch:x86": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), diff --git a/bp2build/cc_library_headers_conversion_test.go b/bp2build/cc_library_headers_conversion_test.go index 5168fe95c..765598666 100644 --- a/bp2build/cc_library_headers_conversion_test.go +++ b/bp2build/cc_library_headers_conversion_test.go @@ -103,9 +103,9 @@ cc_library_headers { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_headers", "foo_headers", AttrNameToString{ "export_includes": `select({ - "//build/bazel/platforms/arch:arm64": ["arch_arm64_exported_include_dir"], - "//build/bazel/platforms/arch:x86": ["arch_x86_exported_include_dir"], - "//build/bazel/platforms/arch:x86_64": ["arch_x86_64_exported_include_dir"], + "//build/bazel_common_rules/platforms/arch:arm64": ["arch_arm64_exported_include_dir"], + "//build/bazel_common_rules/platforms/arch:x86": ["arch_x86_exported_include_dir"], + "//build/bazel_common_rules/platforms/arch:x86_64": ["arch_x86_64_exported_include_dir"], "//conditions:default": [], }) + [ "dir-1", @@ -180,11 +180,11 @@ cc_library_headers { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_headers", "foo_headers", AttrNameToString{ "deps": `select({ - "//build/bazel/platforms/os:android": [":android-lib"], - "//build/bazel/platforms/os:darwin": [":darwin-lib"], - "//build/bazel/platforms/os:linux_bionic": [":linux_bionic-lib"], - "//build/bazel/platforms/os:linux_glibc": [":linux-lib"], - "//build/bazel/platforms/os:windows": [":windows-lib"], + "//build/bazel_common_rules/platforms/os:android": [":android-lib"], + "//build/bazel_common_rules/platforms/os:darwin": [":darwin-lib"], + "//build/bazel_common_rules/platforms/os:linux_bionic": [":linux_bionic-lib"], + "//build/bazel_common_rules/platforms/os:linux_glibc": [":linux-lib"], + "//build/bazel_common_rules/platforms/os:windows": [":windows-lib"], "//conditions:default": [], }) + [":base-lib"]`, }), @@ -217,7 +217,7 @@ cc_library_headers { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_headers", "foo_headers", AttrNameToString{ "deps": `select({ - "//build/bazel/platforms/os:android": [":exported-lib"], + "//build/bazel_common_rules/platforms/os:android": [":exported-lib"], "//conditions:default": [], })`, }), @@ -268,13 +268,13 @@ func TestCcLibraryHeadersArchAndTargetExportSystemIncludes(t *testing.T) { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_headers", "foo_headers", AttrNameToString{ "export_system_includes": `select({ - "//build/bazel/platforms/os:android": ["android_include_dir"], - "//build/bazel/platforms/os:darwin": ["darwin_include_dir"], - "//build/bazel/platforms/os:linux_glibc": ["linux_include_dir"], + "//build/bazel_common_rules/platforms/os:android": ["android_include_dir"], + "//build/bazel_common_rules/platforms/os:darwin": ["darwin_include_dir"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["linux_include_dir"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/arch:arm": ["arm_include_dir"], - "//build/bazel/platforms/arch:x86_64": ["x86_64_include_dir"], + "//build/bazel_common_rules/platforms/arch:arm": ["arm_include_dir"], + "//build/bazel_common_rules/platforms/arch:x86_64": ["x86_64_include_dir"], "//conditions:default": [], }) + ["shared_include_dir"]`, }), diff --git a/bp2build/cc_library_shared_conversion_test.go b/bp2build/cc_library_shared_conversion_test.go index 2c5305f72..9f9fcf9c1 100644 --- a/bp2build/cc_library_shared_conversion_test.go +++ b/bp2build/cc_library_shared_conversion_test.go @@ -204,11 +204,11 @@ cc_library_shared { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_shared", "foo_shared", AttrNameToString{ "implementation_dynamic_deps": `select({ - "//build/bazel/platforms/arch:arm64": [":shared_dep"], + "//build/bazel_common_rules/platforms/arch:arm64": [":shared_dep"], "//conditions:default": [], })`, "whole_archive_deps": `select({ - "//build/bazel/platforms/arch:arm64": [":static_dep"], + "//build/bazel_common_rules/platforms/arch:arm64": [":static_dep"], "//conditions:default": [], })`, }), @@ -233,7 +233,7 @@ cc_library_shared { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_shared", "foo_shared", AttrNameToString{ "implementation_dynamic_deps": `select({ - "//build/bazel/platforms/os:android": [":shared_dep"], + "//build/bazel_common_rules/platforms/os:android": [":shared_dep"], "//conditions:default": [], })`, }), @@ -266,10 +266,10 @@ cc_library_shared { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_shared", "foo_shared", AttrNameToString{ "implementation_dynamic_deps": `[":shared_dep"] + select({ - "//build/bazel/platforms/arch:arm64": [":shared_dep3"], + "//build/bazel_common_rules/platforms/arch:arm64": [":shared_dep3"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:android": [":shared_dep2"], + "//build/bazel_common_rules/platforms/os:android": [":shared_dep2"], "//conditions:default": [], })`, }), @@ -472,7 +472,7 @@ cc_library_shared { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_shared", "foo_shared", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/arch:arm": ["-link_crt"], + "//build/bazel_common_rules/platforms/arch:arm": ["-link_crt"], "//conditions:default": [], })`, "srcs": `["impl.cpp"]`, @@ -1006,8 +1006,8 @@ cc_library_shared { MakeBazelTarget("cc_library_shared", "foo_shared", AttrNameToString{ "srcs_c": `["foo.c"]`, "suffix": `select({ - "//build/bazel/platforms/arch:arm": "-32", - "//build/bazel/platforms/arch:arm64": "-64", + "//build/bazel_common_rules/platforms/arch:arm": "-32", + "//build/bazel_common_rules/platforms/arch:arm64": "-64", "//conditions:default": None, })`, }), @@ -1068,7 +1068,7 @@ cc_library_shared { ExpectedBazelTargets: []string{ MakeBazelTarget("sysprop_library", "foo_sysprop_library", AttrNameToString{ "srcs": `select({ - "//build/bazel/platforms/os:android": ["bar.sysprop"], + "//build/bazel_common_rules/platforms/os:android": ["bar.sysprop"], "//conditions:default": [], })`, }), @@ -1081,7 +1081,7 @@ cc_library_shared { "local_includes": `["."]`, "min_sdk_version": `"5"`, "whole_archive_deps": `select({ - "//build/bazel/platforms/os:android": [":foo_cc_sysprop_library_static"], + "//build/bazel_common_rules/platforms/os:android": [":foo_cc_sysprop_library_static"], "//conditions:default": [], })`, }), @@ -1201,8 +1201,8 @@ cc_library_shared { "ubsan_undefined", "ubsan_nullability", ] + select({ - "//build/bazel/platforms/os:android": ["ubsan_alignment"], - "//build/bazel/platforms/os:linux_glibc": ["ubsan_integer_overflow"], + "//build/bazel_common_rules/platforms/os:android": ["ubsan_alignment"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["ubsan_integer_overflow"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -1303,11 +1303,11 @@ cc_library_shared { MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_arm64": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_riscv64": ["-android_thin_lto"], - "//build/bazel/platforms/os_arch:android_x86": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_x86_64": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_arm": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_arm64": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_riscv64": ["-android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_x86": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_x86_64": ["android_thin_lto"], "//conditions:default": [], })`}), }, @@ -1336,7 +1336,7 @@ cc_library_shared { MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os:android": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os:android": ["android_thin_lto"], "//conditions:default": ["-android_thin_lto"], })`, }), @@ -1400,7 +1400,7 @@ cc_library_shared{ ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/os:android": ["visibility_hidden"], + "//build/bazel_common_rules/platforms/os:android": ["visibility_hidden"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -1510,7 +1510,7 @@ cc_library_shared { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/os:android": ["android_cfi"], + "//build/bazel_common_rules/platforms/os:android": ["android_cfi"], "//conditions:default": [], })`, "local_includes": `["."]`, diff --git a/bp2build/cc_library_static_conversion_test.go b/bp2build/cc_library_static_conversion_test.go index 09e40edab..d7bbd6810 100644 --- a/bp2build/cc_library_static_conversion_test.go +++ b/bp2build/cc_library_static_conversion_test.go @@ -410,11 +410,11 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "implementation_deps": `select({ - "//build/bazel/platforms/arch:arm64": [":static_dep"], + "//build/bazel_common_rules/platforms/arch:arm64": [":static_dep"], "//conditions:default": [], })`, "whole_archive_deps": `select({ - "//build/bazel/platforms/arch:arm64": [":static_dep2"], + "//build/bazel_common_rules/platforms/arch:arm64": [":static_dep2"], "//conditions:default": [], })`, }), @@ -442,11 +442,11 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "implementation_deps": `select({ - "//build/bazel/platforms/os:android": [":static_dep"], + "//build/bazel_common_rules/platforms/os:android": [":static_dep"], "//conditions:default": [], })`, "whole_archive_deps": `select({ - "//build/bazel/platforms/os:android": [":static_dep2"], + "//build/bazel_common_rules/platforms/os:android": [":static_dep2"], "//conditions:default": [], })`, }), @@ -484,10 +484,10 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "implementation_deps": `[":static_dep"] + select({ - "//build/bazel/platforms/arch:arm64": [":static_dep4"], + "//build/bazel_common_rules/platforms/arch:arm64": [":static_dep4"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os:android": [":static_dep3"], + "//build/bazel_common_rules/platforms/os:android": [":static_dep3"], "//conditions:default": [], })`, "whole_archive_deps": `[":static_dep2"]`, @@ -539,7 +539,7 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "srcs_c": `["common.c"] + select({ - "//build/bazel/platforms/arch:arm": ["foo-arm.c"], + "//build/bazel_common_rules/platforms/arch:arm": ["foo-arm.c"], "//conditions:default": [], })`, }), @@ -569,7 +569,7 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "srcs_c": `["common.c"] + select({ - "//build/bazel/platforms/arch:arm": ["for-arm.c"], + "//build/bazel_common_rules/platforms/arch:arm": ["for-arm.c"], "//conditions:default": ["not-for-arm.c"], })`, }), @@ -601,11 +601,11 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "srcs_c": `["common.c"] + select({ - "//build/bazel/platforms/arch:arm": [ + "//build/bazel_common_rules/platforms/arch:arm": [ "not-for-x86.c", "for-arm.c", ], - "//build/bazel/platforms/arch:x86": [ + "//build/bazel_common_rules/platforms/arch:x86": [ "not-for-arm.c", "for-x86.c", ], @@ -650,25 +650,25 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "srcs_c": `["common.c"] + select({ - "//build/bazel/platforms/arch:arm": [ + "//build/bazel_common_rules/platforms/arch:arm": [ "not-for-arm64.c", "not-for-x86.c", "not-for-x86_64.c", "for-arm.c", ], - "//build/bazel/platforms/arch:arm64": [ + "//build/bazel_common_rules/platforms/arch:arm64": [ "not-for-arm.c", "not-for-x86.c", "not-for-x86_64.c", "for-arm64.c", ], - "//build/bazel/platforms/arch:x86": [ + "//build/bazel_common_rules/platforms/arch:x86": [ "not-for-arm.c", "not-for-arm64.c", "not-for-x86_64.c", "for-x86.c", ], - "//build/bazel/platforms/arch:x86_64": [ + "//build/bazel_common_rules/platforms/arch:x86_64": [ "not-for-arm.c", "not-for-arm64.c", "not-for-x86.c", @@ -707,7 +707,7 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "srcs": `["common.cc"] + select({ - "//build/bazel/platforms/arch:arm": [], + "//build/bazel_common_rules/platforms/arch:arm": [], "//conditions:default": ["foo-no-arm.cc"], })`, }), @@ -738,8 +738,8 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "srcs": `["common.cc"] + select({ - "//build/bazel/platforms/arch:arm": [], - "//build/bazel/platforms/arch:x86": [ + "//build/bazel_common_rules/platforms/arch:arm": [], + "//build/bazel_common_rules/platforms/arch:x86": [ "foo-no-arm.cc", "x86-only.cc", ], @@ -792,8 +792,8 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "srcs_c": `["common.c"] + select({ - "//build/bazel/platforms/arch:arm": ["for-lib32.c"], - "//build/bazel/platforms/arch:x86": ["for-lib32.c"], + "//build/bazel_common_rules/platforms/arch:arm": ["for-lib32.c"], + "//build/bazel_common_rules/platforms/arch:x86": ["for-lib32.c"], "//conditions:default": ["not-for-lib32.c"], })`, }), @@ -824,23 +824,23 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "srcs_c": `["common.c"] + select({ - "//build/bazel/platforms/arch:arm": [ + "//build/bazel_common_rules/platforms/arch:arm": [ "not-for-lib64.c", "for-lib32.c", ], - "//build/bazel/platforms/arch:arm64": [ + "//build/bazel_common_rules/platforms/arch:arm64": [ "not-for-lib32.c", "for-lib64.c", ], - "//build/bazel/platforms/arch:riscv64": [ + "//build/bazel_common_rules/platforms/arch:riscv64": [ "not-for-lib32.c", "for-lib64.c", ], - "//build/bazel/platforms/arch:x86": [ + "//build/bazel_common_rules/platforms/arch:x86": [ "not-for-lib64.c", "for-lib32.c", ], - "//build/bazel/platforms/arch:x86_64": [ + "//build/bazel_common_rules/platforms/arch:x86_64": [ "not-for-lib32.c", "for-lib64.c", ], @@ -895,7 +895,7 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "srcs_c": `["common.c"] + select({ - "//build/bazel/platforms/arch:arm": [ + "//build/bazel_common_rules/platforms/arch:arm": [ "not-for-arm64.c", "not-for-lib64.c", "not-for-riscv64.c", @@ -904,7 +904,7 @@ cc_library_static { "for-arm.c", "for-lib32.c", ], - "//build/bazel/platforms/arch:arm64": [ + "//build/bazel_common_rules/platforms/arch:arm64": [ "not-for-arm.c", "not-for-lib32.c", "not-for-riscv64.c", @@ -913,7 +913,7 @@ cc_library_static { "for-arm64.c", "for-lib64.c", ], - "//build/bazel/platforms/arch:riscv64": [ + "//build/bazel_common_rules/platforms/arch:riscv64": [ "not-for-arm.c", "not-for-arm64.c", "not-for-lib32.c", @@ -922,7 +922,7 @@ cc_library_static { "for-riscv64.c", "for-lib64.c", ], - "//build/bazel/platforms/arch:x86": [ + "//build/bazel_common_rules/platforms/arch:x86": [ "not-for-arm.c", "not-for-arm64.c", "not-for-lib64.c", @@ -931,7 +931,7 @@ cc_library_static { "for-x86.c", "for-lib32.c", ], - "//build/bazel/platforms/arch:x86_64": [ + "//build/bazel_common_rules/platforms/arch:x86_64": [ "not-for-arm.c", "not-for-arm64.c", "not-for-lib32.c", @@ -1089,20 +1089,20 @@ cc_library_static { "//dep:generated_src_other_pkg", ":generated_hdr", ] + select({ - "//build/bazel/platforms/arch:x86": ["for-x86.cpp"], + "//build/bazel_common_rules/platforms/arch:x86": ["for-x86.cpp"], "//conditions:default": [ "not-for-x86.cpp", ":generated_src_not_x86", ], }) + select({ - "//build/bazel/platforms/os:android": [":generated_src_android"], + "//build/bazel_common_rules/platforms/os:android": [":generated_src_android"], "//conditions:default": [], })`, "hdrs": `select({ - "//build/bazel/platforms/os:android": ["//dep:generated_hdr_other_pkg_android"], + "//build/bazel_common_rules/platforms/os:android": ["//dep:generated_hdr_other_pkg_android"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/arch:x86": ["//dep:generated_hdr_other_pkg_x86"], + "//build/bazel_common_rules/platforms/arch:x86": ["//dep:generated_hdr_other_pkg_x86"], "//conditions:default": [], }) + ["//dep:generated_hdr_other_pkg"]`, "local_includes": `["."]`, @@ -1147,15 +1147,15 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo_static", AttrNameToString{ "srcs_c": `select({ - "//build/bazel/platforms/os:android": ["android_src.c"], + "//build/bazel_common_rules/platforms/os:android": ["android_src.c"], "//conditions:default": [], }) + select({ - "//build/bazel/platforms/os_arch:android_arm": ["android_arm_src.c"], - "//build/bazel/platforms/os_arch:android_arm64": ["android_arm64_src.c"], - "//build/bazel/platforms/os_arch:android_x86": ["android_x86_src.c"], - "//build/bazel/platforms/os_arch:android_x86_64": ["android_x86_64_src.c"], - "//build/bazel/platforms/os_arch:linux_bionic_arm64": ["linux_bionic_arm64_src.c"], - "//build/bazel/platforms/os_arch:linux_bionic_x86_64": ["linux_bionic_x86_64_src.c"], + "//build/bazel_common_rules/platforms/os_arch:android_arm": ["android_arm_src.c"], + "//build/bazel_common_rules/platforms/os_arch:android_arm64": ["android_arm64_src.c"], + "//build/bazel_common_rules/platforms/os_arch:android_x86": ["android_x86_src.c"], + "//build/bazel_common_rules/platforms/os_arch:android_x86_64": ["android_x86_64_src.c"], + "//build/bazel_common_rules/platforms/os_arch:linux_bionic_arm64": ["linux_bionic_arm64_src.c"], + "//build/bazel_common_rules/platforms/os_arch:linux_bionic_x86_64": ["linux_bionic_x86_64_src.c"], "//conditions:default": [], })`, }), @@ -1358,7 +1358,7 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "target_bionic_empty", AttrNameToString{ "system_dynamic_deps": `select({ - "//build/bazel/platforms/os:linux_musl": [":libc_musl"], + "//build/bazel_common_rules/platforms/os:linux_musl": [":libc_musl"], "//conditions:default": [], })`, }), @@ -1392,7 +1392,7 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "target_linux_bionic_empty", AttrNameToString{ "system_dynamic_deps": `select({ - "//build/bazel/platforms/os:linux_musl": [":libc_musl"], + "//build/bazel_common_rules/platforms/os:linux_musl": [":libc_musl"], "//conditions:default": [], })`, }), @@ -1477,9 +1477,9 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "target_bionic", AttrNameToString{ "system_dynamic_deps": `select({ - "//build/bazel/platforms/os:android": [":libc"], - "//build/bazel/platforms/os:linux_bionic": [":libc"], - "//build/bazel/platforms/os:linux_musl": [":libc_musl"], + "//build/bazel_common_rules/platforms/os:android": [":libc"], + "//build/bazel_common_rules/platforms/os:linux_bionic": [":libc"], + "//build/bazel_common_rules/platforms/os:linux_musl": [":libc_musl"], "//conditions:default": [], })`, }), @@ -1512,8 +1512,8 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "target_linux_bionic", AttrNameToString{ "system_dynamic_deps": `[":libc"] + select({ - "//build/bazel/platforms/os:linux_bionic": [":libm"], - "//build/bazel/platforms/os:linux_musl": [":libc_musl"], + "//build/bazel_common_rules/platforms/os:linux_bionic": [":libm"], + "//build/bazel_common_rules/platforms/os:linux_musl": [":libc_musl"], "//conditions:default": [], })`, }), @@ -1837,7 +1837,7 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("sysprop_library", "foo_sysprop_library", AttrNameToString{ "srcs": `select({ - "//build/bazel/platforms/os:android": ["bar.sysprop"], + "//build/bazel_common_rules/platforms/os:android": ["bar.sysprop"], "//conditions:default": [], })`, }), @@ -1850,7 +1850,7 @@ cc_library_static { "local_includes": `["."]`, "min_sdk_version": `"5"`, "whole_archive_deps": `select({ - "//build/bazel/platforms/os:android": [":foo_cc_sysprop_library_static"], + "//build/bazel_common_rules/platforms/os:android": [":foo_cc_sysprop_library_static"], "//conditions:default": [], })`, }), @@ -1930,8 +1930,8 @@ cc_library_static { "ubsan_undefined", "ubsan_nullability", ] + select({ - "//build/bazel/platforms/os:android": ["ubsan_alignment"], - "//build/bazel/platforms/os:linux_glibc": ["ubsan_integer_overflow"], + "//build/bazel_common_rules/platforms/os:android": ["ubsan_alignment"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["ubsan_integer_overflow"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -2032,11 +2032,11 @@ cc_library_static { MakeBazelTarget("cc_library_static", "foo", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_arm64": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_riscv64": ["-android_thin_lto"], - "//build/bazel/platforms/os_arch:android_x86": ["android_thin_lto"], - "//build/bazel/platforms/os_arch:android_x86_64": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_arm": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_arm64": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_riscv64": ["-android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_x86": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os_arch:android_x86_64": ["android_thin_lto"], "//conditions:default": [], })`}), }, @@ -2065,7 +2065,7 @@ cc_library_static { MakeBazelTarget("cc_library_static", "foo", AttrNameToString{ "local_includes": `["."]`, "features": `select({ - "//build/bazel/platforms/os:android": ["android_thin_lto"], + "//build/bazel_common_rules/platforms/os:android": ["android_thin_lto"], "//conditions:default": ["-android_thin_lto"], })`, }), @@ -2129,7 +2129,7 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/os:android": ["visibility_hidden"], + "//build/bazel_common_rules/platforms/os:android": ["visibility_hidden"], "//conditions:default": [], })`, "local_includes": `["."]`, @@ -2174,7 +2174,7 @@ cc_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_library_static", "foo", AttrNameToString{ "features": `select({ - "//build/bazel/platforms/os:android": ["android_cfi"], + "//build/bazel_common_rules/platforms/os:android": ["android_cfi"], "//conditions:default": [], })`, "local_includes": `["."]`, diff --git a/bp2build/cc_object_conversion_test.go b/bp2build/cc_object_conversion_test.go index e1e2f43d7..4d44db76a 100644 --- a/bp2build/cc_object_conversion_test.go +++ b/bp2build/cc_object_conversion_test.go @@ -232,11 +232,11 @@ func TestCcObjectCflagsOneArch(t *testing.T) { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_object", "foo", AttrNameToString{ "copts": `["-fno-addrsig"] + select({ - "//build/bazel/platforms/arch:x86": ["-fPIC"], + "//build/bazel_common_rules/platforms/arch:x86": ["-fPIC"], "//conditions:default": [], })`, "srcs": `["a.cpp"] + select({ - "//build/bazel/platforms/arch:arm": ["arch/arm/file.cpp"], + "//build/bazel_common_rules/platforms/arch:arm": ["arch/arm/file.cpp"], "//conditions:default": [], })`, "system_dynamic_deps": `[]`, @@ -276,17 +276,17 @@ func TestCcObjectCflagsFourArch(t *testing.T) { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_object", "foo", AttrNameToString{ "copts": `["-fno-addrsig"] + select({ - "//build/bazel/platforms/arch:arm": ["-Wall"], - "//build/bazel/platforms/arch:arm64": ["-Wall"], - "//build/bazel/platforms/arch:x86": ["-fPIC"], - "//build/bazel/platforms/arch:x86_64": ["-fPIC"], + "//build/bazel_common_rules/platforms/arch:arm": ["-Wall"], + "//build/bazel_common_rules/platforms/arch:arm64": ["-Wall"], + "//build/bazel_common_rules/platforms/arch:x86": ["-fPIC"], + "//build/bazel_common_rules/platforms/arch:x86_64": ["-fPIC"], "//conditions:default": [], })`, "srcs": `["base.cpp"] + select({ - "//build/bazel/platforms/arch:arm": ["arm.cpp"], - "//build/bazel/platforms/arch:arm64": ["arm64.cpp"], - "//build/bazel/platforms/arch:x86": ["x86.cpp"], - "//build/bazel/platforms/arch:x86_64": ["x86_64.cpp"], + "//build/bazel_common_rules/platforms/arch:arm": ["arm.cpp"], + "//build/bazel_common_rules/platforms/arch:arm64": ["arm64.cpp"], + "//build/bazel_common_rules/platforms/arch:x86": ["x86.cpp"], + "//build/bazel_common_rules/platforms/arch:x86_64": ["x86_64.cpp"], "//conditions:default": [], })`, "system_dynamic_deps": `[]`, @@ -364,15 +364,15 @@ cc_object { MakeBazelTarget("cc_object", "foo", AttrNameToString{ "copts": `["-fno-addrsig"]`, "objs": `select({ - "//build/bazel/platforms/arch:arm": [":arm_obj"], - "//build/bazel/platforms/arch:x86": [":x86_obj"], - "//build/bazel/platforms/arch:x86_64": [":x86_64_obj"], + "//build/bazel_common_rules/platforms/arch:arm": [":arm_obj"], + "//build/bazel_common_rules/platforms/arch:x86": [":x86_obj"], + "//build/bazel_common_rules/platforms/arch:x86_64": [":x86_64_obj"], "//conditions:default": [], })`, "linker_script": `select({ - "//build/bazel/platforms/arch:arm": "arm.lds", - "//build/bazel/platforms/arch:x86": "x86.lds", - "//build/bazel/platforms/arch:x86_64": "x86_64.lds", + "//build/bazel_common_rules/platforms/arch:arm": "arm.lds", + "//build/bazel_common_rules/platforms/arch:x86": "x86.lds", + "//build/bazel_common_rules/platforms/arch:x86_64": "x86_64.lds", "//conditions:default": None, })`, "srcs": `["base.cpp"]`, @@ -405,18 +405,18 @@ func TestCcObjectSelectOnLinuxAndBionicArchs(t *testing.T) { MakeBazelTarget("cc_object", "foo", AttrNameToString{ "copts": `["-fno-addrsig"]`, "srcs": `["base.cpp"] + select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "linux_arm64.cpp", "bionic_arm64.cpp", ], - "//build/bazel/platforms/os_arch:android_x86": ["linux_x86.cpp"], - "//build/bazel/platforms/os_arch:linux_bionic_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_x86": ["linux_x86.cpp"], + "//build/bazel_common_rules/platforms/os_arch:linux_bionic_arm64": [ "linux_arm64.cpp", "bionic_arm64.cpp", ], - "//build/bazel/platforms/os_arch:linux_glibc_x86": ["linux_x86.cpp"], - "//build/bazel/platforms/os_arch:linux_musl_arm64": ["linux_arm64.cpp"], - "//build/bazel/platforms/os_arch:linux_musl_x86": ["linux_x86.cpp"], + "//build/bazel_common_rules/platforms/os_arch:linux_glibc_x86": ["linux_x86.cpp"], + "//build/bazel_common_rules/platforms/os_arch:linux_musl_arm64": ["linux_arm64.cpp"], + "//build/bazel_common_rules/platforms/os_arch:linux_musl_x86": ["linux_x86.cpp"], "//conditions:default": [], })`, }), diff --git a/bp2build/cc_prebuilt_binary_conversion_test.go b/bp2build/cc_prebuilt_binary_conversion_test.go index 0e8048c27..9adaf32d1 100644 --- a/bp2build/cc_prebuilt_binary_conversion_test.go +++ b/bp2build/cc_prebuilt_binary_conversion_test.go @@ -95,8 +95,8 @@ cc_prebuilt_binary { }`, ExpectedBazelTargets: []string{ MakeBazelTarget("cc_prebuilt_binary", "bintest", AttrNameToString{ "src": `select({ - "//build/bazel/platforms/arch:arm": "binb", - "//build/bazel/platforms/arch:arm64": "bina", + "//build/bazel_common_rules/platforms/arch:arm": "binb", + "//build/bazel_common_rules/platforms/arch:arm64": "bina", "//conditions:default": None, })`, }), diff --git a/bp2build/cc_prebuilt_library_conversion_test.go b/bp2build/cc_prebuilt_library_conversion_test.go index 8c33be3c9..a7f0c7b27 100644 --- a/bp2build/cc_prebuilt_library_conversion_test.go +++ b/bp2build/cc_prebuilt_library_conversion_test.go @@ -76,21 +76,21 @@ cc_prebuilt_library { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_prebuilt_library_static", "libtest_bp2build_cc_library_static", AttrNameToString{ "static_library": `select({ - "//build/bazel/platforms/arch:arm": "libg.so", - "//build/bazel/platforms/arch:arm64": "libf.so", + "//build/bazel_common_rules/platforms/arch:arm": "libg.so", + "//build/bazel_common_rules/platforms/arch:arm64": "libf.so", "//conditions:default": None, })`}), MakeBazelTarget("cc_prebuilt_library_static", "libtest_bp2build_cc_library_static_alwayslink", AttrNameToString{ "alwayslink": "True", "static_library": `select({ - "//build/bazel/platforms/arch:arm": "libg.so", - "//build/bazel/platforms/arch:arm64": "libf.so", + "//build/bazel_common_rules/platforms/arch:arm": "libg.so", + "//build/bazel_common_rules/platforms/arch:arm64": "libf.so", "//conditions:default": None, })`}), MakeBazelTarget("cc_prebuilt_library_shared", "libtest", AttrNameToString{ "shared_library": `select({ - "//build/bazel/platforms/arch:arm": "libg.so", - "//build/bazel/platforms/arch:arm64": "libf.so", + "//build/bazel_common_rules/platforms/arch:arm": "libg.so", + "//build/bazel_common_rules/platforms/arch:arm64": "libf.so", "//conditions:default": None, })`, }), @@ -289,16 +289,16 @@ cc_prebuilt_library { MakeBazelTarget("cc_prebuilt_library_shared", "libtest", AttrNameToString{ "shared_library": `"libf.so"`, "export_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), MakeBazelTarget("cc_prebuilt_library_static", "libtest_bp2build_cc_library_static", AttrNameToString{ "static_library": `"libf.so"`, "export_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), @@ -306,8 +306,8 @@ cc_prebuilt_library { "alwayslink": "True", "static_library": `"libf.so"`, "export_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), @@ -336,16 +336,16 @@ cc_prebuilt_library { MakeBazelTarget("cc_prebuilt_library_shared", "libtest", AttrNameToString{ "shared_library": `"libf.so"`, "export_system_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), MakeBazelTarget("cc_prebuilt_library_static", "libtest_bp2build_cc_library_static", AttrNameToString{ "static_library": `"libf.so"`, "export_system_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), @@ -353,8 +353,8 @@ cc_prebuilt_library { "alwayslink": "True", "static_library": `"libf.so"`, "export_system_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), @@ -381,11 +381,11 @@ ndk_prebuilt_shared_stl { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_prebuilt_library_static", "ndk_libfoo_static", AttrNameToString{ "static_library": `select({ - "//build/bazel/platforms/os_arch:android_arm": "current/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libfoo_static.a", - "//build/bazel/platforms/os_arch:android_arm64": "current/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libfoo_static.a", - "//build/bazel/platforms/os_arch:android_riscv64": "current/sources/cxx-stl/llvm-libc++/libs/riscv64/libfoo_static.a", - "//build/bazel/platforms/os_arch:android_x86": "current/sources/cxx-stl/llvm-libc++/libs/x86/libfoo_static.a", - "//build/bazel/platforms/os_arch:android_x86_64": "current/sources/cxx-stl/llvm-libc++/libs/x86_64/libfoo_static.a", + "//build/bazel_common_rules/platforms/os_arch:android_arm": "current/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libfoo_static.a", + "//build/bazel_common_rules/platforms/os_arch:android_arm64": "current/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libfoo_static.a", + "//build/bazel_common_rules/platforms/os_arch:android_riscv64": "current/sources/cxx-stl/llvm-libc++/libs/riscv64/libfoo_static.a", + "//build/bazel_common_rules/platforms/os_arch:android_x86": "current/sources/cxx-stl/llvm-libc++/libs/x86/libfoo_static.a", + "//build/bazel_common_rules/platforms/os_arch:android_x86_64": "current/sources/cxx-stl/llvm-libc++/libs/x86_64/libfoo_static.a", "//conditions:default": None, })`, "export_system_includes": `[ @@ -395,11 +395,11 @@ ndk_prebuilt_shared_stl { }), MakeBazelTarget("cc_prebuilt_library_shared", "ndk_libfoo_shared", AttrNameToString{ "shared_library": `select({ - "//build/bazel/platforms/os_arch:android_arm": "current/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libfoo_shared.so", - "//build/bazel/platforms/os_arch:android_arm64": "current/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libfoo_shared.so", - "//build/bazel/platforms/os_arch:android_riscv64": "current/sources/cxx-stl/llvm-libc++/libs/riscv64/libfoo_shared.so", - "//build/bazel/platforms/os_arch:android_x86": "current/sources/cxx-stl/llvm-libc++/libs/x86/libfoo_shared.so", - "//build/bazel/platforms/os_arch:android_x86_64": "current/sources/cxx-stl/llvm-libc++/libs/x86_64/libfoo_shared.so", + "//build/bazel_common_rules/platforms/os_arch:android_arm": "current/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libfoo_shared.so", + "//build/bazel_common_rules/platforms/os_arch:android_arm64": "current/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libfoo_shared.so", + "//build/bazel_common_rules/platforms/os_arch:android_riscv64": "current/sources/cxx-stl/llvm-libc++/libs/riscv64/libfoo_shared.so", + "//build/bazel_common_rules/platforms/os_arch:android_x86": "current/sources/cxx-stl/llvm-libc++/libs/x86/libfoo_shared.so", + "//build/bazel_common_rules/platforms/os_arch:android_x86_64": "current/sources/cxx-stl/llvm-libc++/libs/x86_64/libfoo_shared.so", "//conditions:default": None, })`, "export_system_includes": `[ diff --git a/bp2build/cc_prebuilt_library_shared_conversion_test.go b/bp2build/cc_prebuilt_library_shared_conversion_test.go index 9e975aea3..2242758c6 100644 --- a/bp2build/cc_prebuilt_library_shared_conversion_test.go +++ b/bp2build/cc_prebuilt_library_shared_conversion_test.go @@ -68,8 +68,8 @@ cc_prebuilt_library_shared { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_prebuilt_library_shared", "libtest", AttrNameToString{ "shared_library": `select({ - "//build/bazel/platforms/arch:arm": "libg.so", - "//build/bazel/platforms/arch:arm64": "libf.so", + "//build/bazel_common_rules/platforms/arch:arm": "libg.so", + "//build/bazel_common_rules/platforms/arch:arm64": "libf.so", "//conditions:default": None, })`, }), @@ -125,8 +125,8 @@ cc_prebuilt_library_shared { MakeBazelTarget("cc_prebuilt_library_shared", "libtest", AttrNameToString{ "shared_library": `"libf.so"`, "export_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), @@ -155,8 +155,8 @@ cc_prebuilt_library_shared { MakeBazelTarget("cc_prebuilt_library_shared", "libtest", AttrNameToString{ "shared_library": `"libf.so"`, "export_system_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), diff --git a/bp2build/cc_prebuilt_library_shared_test.go b/bp2build/cc_prebuilt_library_shared_test.go index 58c0a703d..1a9579ace 100644 --- a/bp2build/cc_prebuilt_library_shared_test.go +++ b/bp2build/cc_prebuilt_library_shared_test.go @@ -52,8 +52,8 @@ cc_prebuilt_library_shared { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_prebuilt_library_shared", "libtest", AttrNameToString{ "shared_library": `select({ - "//build/bazel/platforms/arch:arm": "libg.so", - "//build/bazel/platforms/arch:arm64": "libf.so", + "//build/bazel_common_rules/platforms/arch:arm": "libg.so", + "//build/bazel_common_rules/platforms/arch:arm64": "libf.so", "//conditions:default": None, })`, }), diff --git a/bp2build/cc_prebuilt_library_static_conversion_test.go b/bp2build/cc_prebuilt_library_static_conversion_test.go index 77562e726..fb408b5f0 100644 --- a/bp2build/cc_prebuilt_library_static_conversion_test.go +++ b/bp2build/cc_prebuilt_library_static_conversion_test.go @@ -72,15 +72,15 @@ cc_prebuilt_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_prebuilt_library_static", "libtest", AttrNameToString{ "static_library": `select({ - "//build/bazel/platforms/arch:arm": "libg.so", - "//build/bazel/platforms/arch:arm64": "libf.so", + "//build/bazel_common_rules/platforms/arch:arm": "libg.so", + "//build/bazel_common_rules/platforms/arch:arm64": "libf.so", "//conditions:default": None, })`}), MakeBazelTarget("cc_prebuilt_library_static", "libtest_alwayslink", AttrNameToString{ "alwayslink": "True", "static_library": `select({ - "//build/bazel/platforms/arch:arm": "libg.so", - "//build/bazel/platforms/arch:arm64": "libf.so", + "//build/bazel_common_rules/platforms/arch:arm": "libg.so", + "//build/bazel_common_rules/platforms/arch:arm64": "libf.so", "//conditions:default": None, })`}), }, @@ -141,8 +141,8 @@ cc_prebuilt_library_static { MakeBazelTarget("cc_prebuilt_library_static", "libtest", AttrNameToString{ "static_library": `"libf.so"`, "export_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), @@ -150,8 +150,8 @@ cc_prebuilt_library_static { "alwayslink": "True", "static_library": `"libf.so"`, "export_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), @@ -180,8 +180,8 @@ cc_prebuilt_library_static { MakeBazelTarget("cc_prebuilt_library_static", "libtest", AttrNameToString{ "static_library": `"libf.so"`, "export_system_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), @@ -189,8 +189,8 @@ cc_prebuilt_library_static { "alwayslink": "True", "static_library": `"libf.so"`, "export_system_includes": `select({ - "//build/bazel/platforms/arch:arm": ["testdir/1/"], - "//build/bazel/platforms/arch:arm64": ["testdir/2/"], + "//build/bazel_common_rules/platforms/arch:arm": ["testdir/1/"], + "//build/bazel_common_rules/platforms/arch:arm64": ["testdir/2/"], "//conditions:default": [], })`, }), diff --git a/bp2build/cc_prebuilt_library_static_test.go b/bp2build/cc_prebuilt_library_static_test.go index 17da8132a..7d0ab2874 100644 --- a/bp2build/cc_prebuilt_library_static_test.go +++ b/bp2build/cc_prebuilt_library_static_test.go @@ -69,15 +69,15 @@ cc_prebuilt_library_static { ExpectedBazelTargets: []string{ MakeBazelTarget("cc_prebuilt_library_static", "libtest", AttrNameToString{ "static_library": `select({ - "//build/bazel/platforms/arch:arm": "libg.so", - "//build/bazel/platforms/arch:arm64": "libf.so", + "//build/bazel_common_rules/platforms/arch:arm": "libg.so", + "//build/bazel_common_rules/platforms/arch:arm64": "libf.so", "//conditions:default": None, })`}), MakeBazelTarget("cc_prebuilt_library_static", "libtest_alwayslink", AttrNameToString{ "alwayslink": "True", "static_library": `select({ - "//build/bazel/platforms/arch:arm": "libg.so", - "//build/bazel/platforms/arch:arm64": "libf.so", + "//build/bazel_common_rules/platforms/arch:arm": "libg.so", + "//build/bazel_common_rules/platforms/arch:arm64": "libf.so", "//conditions:default": None, })`}), }, diff --git a/bp2build/cc_prebuilt_object_conversion_test.go b/bp2build/cc_prebuilt_object_conversion_test.go index 903c81634..068e4e28b 100644 --- a/bp2build/cc_prebuilt_object_conversion_test.go +++ b/bp2build/cc_prebuilt_object_conversion_test.go @@ -71,8 +71,8 @@ cc_prebuilt_object { }`, ExpectedBazelTargets: []string{ MakeBazelTarget("cc_prebuilt_object", "objtest", AttrNameToString{ "src": `select({ - "//build/bazel/platforms/arch:arm": "objb.o", - "//build/bazel/platforms/arch:arm64": "obja.o", + "//build/bazel_common_rules/platforms/arch:arm": "objb.o", + "//build/bazel_common_rules/platforms/arch:arm64": "obja.o", "//conditions:default": None, })`, }), diff --git a/bp2build/cc_test_conversion_test.go b/bp2build/cc_test_conversion_test.go index 679a36461..c5f5f795c 100644 --- a/bp2build/cc_test_conversion_test.go +++ b/bp2build/cc_test_conversion_test.go @@ -117,26 +117,26 @@ cc_test_library { ":libgtest_main", ":libgtest", ] + select({ - "//build/bazel/platforms/os:darwin": [":hostlib"], - "//build/bazel/platforms/os:linux_bionic": [":hostlib"], - "//build/bazel/platforms/os:linux_glibc": [":hostlib"], - "//build/bazel/platforms/os:linux_musl": [":hostlib"], - "//build/bazel/platforms/os:windows": [":hostlib"], + "//build/bazel_common_rules/platforms/os:darwin": [":hostlib"], + "//build/bazel_common_rules/platforms/os:linux_bionic": [":hostlib"], + "//build/bazel_common_rules/platforms/os:linux_glibc": [":hostlib"], + "//build/bazel_common_rules/platforms/os:linux_musl": [":hostlib"], + "//build/bazel_common_rules/platforms/os:windows": [":hostlib"], "//conditions:default": [], })`, "local_includes": `["."]`, "dynamic_deps": `[":cc_test_lib2"] + select({ - "//build/bazel/platforms/os:android": [":foolib"], + "//build/bazel_common_rules/platforms/os:android": [":foolib"], "//conditions:default": [], })`, "srcs": `["test.cpp"] + select({ - "//build/bazel/platforms/os:android": [ + "//build/bazel_common_rules/platforms/os:android": [ "linux.cpp", "android.cpp", ], - "//build/bazel/platforms/os:linux_bionic": ["linux.cpp"], - "//build/bazel/platforms/os:linux_glibc": ["linux.cpp"], - "//build/bazel/platforms/os:linux_musl": ["linux.cpp"], + "//build/bazel_common_rules/platforms/os:linux_bionic": ["linux.cpp"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["linux.cpp"], + "//build/bazel_common_rules/platforms/os:linux_musl": ["linux.cpp"], "//conditions:default": [], })`, "runs_on": `[ @@ -144,7 +144,7 @@ cc_test_library { "device", ]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -178,7 +178,7 @@ cc_test { "device", ]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -217,7 +217,7 @@ cc_test { "device", ]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -248,7 +248,7 @@ cc_test { {"cc_test", "mytest", AttrNameToString{ "local_includes": `["."]`, "srcs": `["test.cpp"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "test_config": `"test_config.xml"`, "deps": `[ ":libgtest_main", @@ -256,7 +256,7 @@ cc_test { ]`, "runs_on": `["device"]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -287,7 +287,7 @@ cc_test { {"cc_test", "mytest", AttrNameToString{ "local_includes": `["."]`, "srcs": `["test.cpp"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "test_config": `"AndroidTest.xml"`, "dynamic_config": `"DynamicConfig.xml"`, "deps": `[ @@ -296,7 +296,7 @@ cc_test { ]`, "runs_on": `["device"]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -330,7 +330,7 @@ cc_test { "auto_generate_test_config": "True", "local_includes": `["."]`, "srcs": `["test.cpp"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "template_configs": `[ "'<target_preparer class=\"com.android.tradefed.targetprep.RootTargetPreparer\">\\n <option name=\"force-root\" value=\"false\" />\\n </target_preparer>'", "'<option name=\"not-shardable\" value=\"true\" />'", @@ -341,7 +341,7 @@ cc_test { "dynamic_deps": `[":liblog"]`, "runs_on": `["device"]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -369,14 +369,14 @@ cc_test { {"cc_test", "mytest", AttrNameToString{ "local_includes": `["."]`, "srcs": `["test.cpp"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "deps": `[ ":libgtest", ":libgtest_main", ]`, "runs_on": `["device"]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -405,12 +405,12 @@ cc_test { {"cc_test", "mytest", AttrNameToString{ "local_includes": `["."]`, "srcs": `["test.cpp"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "deps": `[":libgtest_isolated_main"]`, "dynamic_deps": `[":liblog"]`, "runs_on": `["device"]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -446,10 +446,10 @@ cc_test { ":libgtest", ]`, "gtest": "True", - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "runs_on": `["device"]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -460,10 +460,10 @@ cc_test { {"cc_test", "mytest_with_no_gtest", AttrNameToString{ "local_includes": `["."]`, "gtest": "False", - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "runs_on": `["device"]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -495,12 +495,12 @@ cc_test { {"cc_test", "mytest", AttrNameToString{ "local_includes": `["."]`, "srcs": `["test.cpp"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "deps": `[":libgtest_isolated_main"]`, "dynamic_deps": `[":liblog"]`, "runs_on": `["device"]`, "features": `["android_cfi"] + select({ - "//build/bazel/platforms/os_arch:android_arm64": ["-memtag_heap"], + "//build/bazel_common_rules/platforms/os_arch:android_arm64": ["-memtag_heap"], "//conditions:default": [], })`, }, @@ -532,12 +532,12 @@ cc_test { {"cc_test", "mytest", AttrNameToString{ "local_includes": `["."]`, "srcs": `["test.cpp"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "deps": `[":libgtest_isolated_main"]`, "dynamic_deps": `[":liblog"]`, "runs_on": `["device"]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": ["-memtag_heap"], + "//build/bazel_common_rules/platforms/os_arch:android_arm64": ["-memtag_heap"], "//conditions:default": [], })`, }, @@ -569,12 +569,12 @@ cc_test { {"cc_test", "mytest", AttrNameToString{ "local_includes": `["."]`, "srcs": `["test.cpp"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "deps": `[":libgtest_isolated_main"]`, "dynamic_deps": `[":liblog"]`, "runs_on": `["device"]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "memtag_heap", "diag_memtag_heap", ], @@ -615,12 +615,12 @@ cc_test { {"cc_test", "mytest", AttrNameToString{ "local_includes": `["."]`, "srcs": `["test.cpp"]`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, "deps": `[":libgtest_isolated_main"]`, "dynamic_deps": `[":liblog"]`, "runs_on": `["device"]`, "features": `select({ - "//build/bazel/platforms/os_arch:android_arm64": [ + "//build/bazel_common_rules/platforms/os_arch:android_arm64": [ "-memtag_heap", "-diag_memtag_heap", ], diff --git a/bp2build/cc_yasm_conversion_test.go b/bp2build/cc_yasm_conversion_test.go index 55d4febf9..c98e1a16c 100644 --- a/bp2build/cc_yasm_conversion_test.go +++ b/bp2build/cc_yasm_conversion_test.go @@ -126,14 +126,14 @@ cc_library { MakeBazelTarget("yasm", "foo_yasm", map[string]string{ "include_dirs": `["."]`, "srcs": `select({ - "//build/bazel/platforms/arch:x86": ["myfile.asm"], + "//build/bazel_common_rules/platforms/arch:x86": ["myfile.asm"], "//conditions:default": [], })`, }), }, makeCcLibraryTargets("foo", map[string]string{ "local_includes": `["."]`, "srcs": `["main.cpp"] + select({ - "//build/bazel/platforms/arch:x86": [":foo_yasm"], + "//build/bazel_common_rules/platforms/arch:x86": [":foo_yasm"], "//conditions:default": [], })`, })...), @@ -164,7 +164,7 @@ cc_library { MakeBazelTarget("yasm", "foo_yasm", map[string]string{ "include_dirs": `["."]`, "srcs": `["myfile.asm"] + select({ - "//build/bazel/platforms/arch:x86": ["mysecondfile.asm"], + "//build/bazel_common_rules/platforms/arch:x86": ["mysecondfile.asm"], "//conditions:default": [], })`, }), diff --git a/bp2build/fdo_profile_conversion_test.go b/bp2build/fdo_profile_conversion_test.go index 4d04283ca..918b27ce5 100644 --- a/bp2build/fdo_profile_conversion_test.go +++ b/bp2build/fdo_profile_conversion_test.go @@ -50,8 +50,8 @@ fdo_profile { }`, expectedBazelAttrs: AttrNameToString{ "profile": `select({ - "//build/bazel/platforms/arch:arm": "foo_arm.afdo", - "//build/bazel/platforms/arch:arm64": "foo_arm64.afdo", + "//build/bazel_common_rules/platforms/arch:arm": "foo_arm.afdo", + "//build/bazel_common_rules/platforms/arch:arm64": "foo_arm64.afdo", "//conditions:default": None, })`, }, diff --git a/bp2build/genrule_conversion_test.go b/bp2build/genrule_conversion_test.go index 7e9b17bca..af03dffa7 100644 --- a/bp2build/genrule_conversion_test.go +++ b/bp2build/genrule_conversion_test.go @@ -681,11 +681,11 @@ func TestCcGenruleArchAndExcludeSrcs(t *testing.T) { expectedBazelAttrs := AttrNameToString{ "srcs": `["foo1.in"] + select({ - "//build/bazel/platforms/arch:arm": ["foo1_arch.in"], + "//build/bazel_common_rules/platforms/arch:arm": ["foo1_arch.in"], "//conditions:default": [], })`, "cmd": `"cat $(SRCS) > $(OUTS)"`, - "target_compatible_with": `["//build/bazel/platforms/os:android"]`, + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, } expectedBazelTargets := []string{ diff --git a/bp2build/go_conversion_test.go b/bp2build/go_conversion_test.go index 2387641f2..ebd241d11 100644 --- a/bp2build/go_conversion_test.go +++ b/bp2build/go_conversion_test.go @@ -84,8 +84,8 @@ bootstrap_go_package { "foo1.go", "foo2.go", ] + select({ - "//build/bazel/platforms/os:darwin": ["foo_darwin.go"], - "//build/bazel/platforms/os:linux_glibc": ["foo_linux.go"], + "//build/bazel_common_rules/platforms/os:darwin": ["foo_darwin.go"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["foo_linux.go"], "//conditions:default": [], })`, }, @@ -98,8 +98,8 @@ bootstrap_go_package { "foo1_test.go", "foo2_test.go", ] + select({ - "//build/bazel/platforms/os:darwin": ["foo_darwin_test.go"], - "//build/bazel/platforms/os:linux_glibc": ["foo_linux_test.go"], + "//build/bazel_common_rules/platforms/os:darwin": ["foo_darwin_test.go"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["foo_linux_test.go"], "//conditions:default": [], })`, }, diff --git a/bp2build/java_binary_host_conversion_test.go b/bp2build/java_binary_host_conversion_test.go index 4271f76a5..29c0e4422 100644 --- a/bp2build/java_binary_host_conversion_test.go +++ b/bp2build/java_binary_host_conversion_test.go @@ -63,7 +63,7 @@ func TestJavaBinaryHost(t *testing.T) { "java_version": `"8"`, "javacopts": `["-Xdoclint:all/protected"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -71,7 +71,7 @@ func TestJavaBinaryHost(t *testing.T) { "main_class": `"com.android.test.MainClass"`, "jvm_flags": `["-Djava.library.path=$${RUNPATH}other/jni-lib-1"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, "runtime_deps": `[":java-binary-host-1_lib"]`, @@ -102,7 +102,7 @@ java_library { "main_class": `"com.android.test.MainClass"`, "runtime_deps": `[":java-dep-1"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -132,14 +132,14 @@ java_import_host{ "srcs": `["a.java"]`, "deps": `[":java-lib-dep-1-neverlink"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), MakeBazelTarget("java_binary", "java-binary-host-libs", AttrNameToString{ "main_class": `"com.android.test.MainClass"`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, "runtime_deps": `[":java-binary-host-libs_lib"]`, @@ -165,7 +165,7 @@ func TestJavaBinaryHostKotlinSrcs(t *testing.T) { "b.kt", ]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -173,7 +173,7 @@ func TestJavaBinaryHostKotlinSrcs(t *testing.T) { "main_class": `"com.android.test.MainClass"`, "runtime_deps": `[":java-binary-host_lib"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -197,7 +197,7 @@ func TestJavaBinaryHostKotlinCommonSrcs(t *testing.T) { "srcs": `["a.java"]`, "common_srcs": `["b.kt"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -205,7 +205,7 @@ func TestJavaBinaryHostKotlinCommonSrcs(t *testing.T) { "main_class": `"com.android.test.MainClass"`, "runtime_deps": `[":java-binary-host_lib"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -240,7 +240,7 @@ func TestJavaBinaryHostKotlinWithResourceDir(t *testing.T) { ]`, "resource_strip_prefix": `"res"`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -248,7 +248,7 @@ func TestJavaBinaryHostKotlinWithResourceDir(t *testing.T) { "main_class": `"com.android.test.MainClass"`, "runtime_deps": `[":java-binary-host_lib"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -286,7 +286,7 @@ func TestJavaBinaryHostKotlinWithResources(t *testing.T) { ]`, "resource_strip_prefix": `"adir"`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -294,7 +294,7 @@ func TestJavaBinaryHostKotlinWithResources(t *testing.T) { "main_class": `"com.android.test.MainClass"`, "runtime_deps": `[":java-binary-host_lib"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -321,7 +321,7 @@ func TestJavaBinaryHostKotlinCflags(t *testing.T) { "-flag2", ]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -329,7 +329,7 @@ func TestJavaBinaryHostKotlinCflags(t *testing.T) { "main_class": `"com.android.test.MainClass"`, "runtime_deps": `[":java-binary-host_lib"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), diff --git a/bp2build/java_import_conversion_test.go b/bp2build/java_import_conversion_test.go index d9910afb9..bba2f5077 100644 --- a/bp2build/java_import_conversion_test.go +++ b/bp2build/java_import_conversion_test.go @@ -88,8 +88,8 @@ java_import { ExpectedBazelTargets: []string{ MakeBazelTarget("java_import", "example_import", AttrNameToString{ "jars": `select({ - "//build/bazel/platforms/os:android": ["android.jar"], - "//build/bazel/platforms/os:linux_glibc": ["linux.jar"], + "//build/bazel_common_rules/platforms/os:android": ["android.jar"], + "//build/bazel_common_rules/platforms/os:linux_glibc": ["linux.jar"], "//conditions:default": [], })`, }), diff --git a/bp2build/java_library_conversion_test.go b/bp2build/java_library_conversion_test.go index ad0ec655a..9cb9443cc 100644 --- a/bp2build/java_library_conversion_test.go +++ b/bp2build/java_library_conversion_test.go @@ -780,7 +780,7 @@ android_library { AttrNameToString{ "srcs": `["lib.java"] + select({ "//build/bazel/platforms/arch/variants:arm-neon": [], - "//build/bazel/platforms/arch:arm": ["arm_non_neon.java"], + "//build/bazel_common_rules/platforms/arch:arm": ["arm_non_neon.java"], "//conditions:default": [], })`, "manifest": `"manifest/AndroidManifest.xml"`, @@ -899,11 +899,11 @@ func TestJavaLibraryArchVariantDeps(t *testing.T) { MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{ "srcs": `["a.java"]`, "exports": `select({ - "//build/bazel/platforms/os:android": [":java-lib-4"], + "//build/bazel_common_rules/platforms/os:android": [":java-lib-4"], "//conditions:default": [], })`, "deps": `[":java-lib-2-neverlink"] + select({ - "//build/bazel/platforms/os:android": [ + "//build/bazel_common_rules/platforms/os:android": [ ":java-lib-3-neverlink", ":java-lib-4", ], @@ -934,7 +934,7 @@ func TestJavaLibraryArchVariantSrcsWithExcludes(t *testing.T) { ExpectedBazelTargets: []string{ MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{ "srcs": `["b.java"] + select({ - "//build/bazel/platforms/os:android": [], + "//build/bazel_common_rules/platforms/os:android": [], "//conditions:default": ["a.java"], })`, "sdk_version": `"current"`, diff --git a/bp2build/java_library_host_conversion_test.go b/bp2build/java_library_host_conversion_test.go index 9e47b0972..d0fdec62d 100644 --- a/bp2build/java_library_host_conversion_test.go +++ b/bp2build/java_library_host_conversion_test.go @@ -50,7 +50,7 @@ java_library_host { "srcs": `["a.java"]`, "deps": `[":java-lib-host-2-neverlink"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -58,7 +58,7 @@ java_library_host { "exports": `[":java-lib-host-1"]`, "neverlink": `True`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -66,7 +66,7 @@ java_library_host { "java_version": `"9"`, "srcs": `["c.java"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -74,7 +74,7 @@ java_library_host { "exports": `[":java-lib-host-2"]`, "neverlink": `True`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, "java_version": `"9"`, diff --git a/bp2build/java_plugin_conversion_test.go b/bp2build/java_plugin_conversion_test.go index dcc17b5ce..e63cc55ab 100644 --- a/bp2build/java_plugin_conversion_test.go +++ b/bp2build/java_plugin_conversion_test.go @@ -55,7 +55,7 @@ java_library { ExpectedBazelTargets: []string{ MakeBazelTarget("java_plugin", "java-plug-1", AttrNameToString{ "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, "deps": `[ @@ -95,7 +95,7 @@ java_library { ExpectedBazelTargets: []string{ MakeBazelTarget("java_plugin", "java-plug-1", AttrNameToString{ "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, "deps": `[ diff --git a/bp2build/java_test_host_conversion_test.go b/bp2build/java_test_host_conversion_test.go index 87f35f6bc..5d93f58d0 100644 --- a/bp2build/java_test_host_conversion_test.go +++ b/bp2build/java_test_host_conversion_test.go @@ -34,7 +34,7 @@ func TestJavaTestHostGeneral(t *testing.T) { runJavaTestHostTestCase(t, Bp2buildTestCase{ Description: "java_test_host general", Filesystem: map[string]string{}, - StubbedBuildDefinitions: []string{"lib_a", "lib_b"}, + StubbedBuildDefinitions: []string{"lib_a", "static_libs_a"}, Blueprint: ` java_test_host { name: "java_test_host-1", @@ -64,7 +64,7 @@ java_library { "javacopts": `["-Xdoclint:all/protected"]`, "srcs": `["a.java"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -76,7 +76,7 @@ java_library { ]`, "srcs": `["a.java"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -111,7 +111,7 @@ java_library { ":static_libs_a", ]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -137,7 +137,7 @@ java_test_host { ]`, "runtime_deps": `[":java_test_host-1_lib"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -147,7 +147,7 @@ java_test_host { "b.kt", ]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), diff --git a/bp2build/prebuilt_etc_conversion_test.go b/bp2build/prebuilt_etc_conversion_test.go index e2373038a..1f372706b 100644 --- a/bp2build/prebuilt_etc_conversion_test.go +++ b/bp2build/prebuilt_etc_conversion_test.go @@ -80,8 +80,8 @@ prebuilt_etc { "filename": `"tz_version"`, "installable": `False`, "src": `select({ - "//build/bazel/platforms/arch:arm": "arm", - "//build/bazel/platforms/arch:arm64": "arm64", + "//build/bazel_common_rules/platforms/arch:arm": "arm", + "//build/bazel_common_rules/platforms/arch:arm64": "arm64", "//conditions:default": "version/tz_version", })`, "dir": `"etc/tz"`, @@ -119,11 +119,11 @@ prebuilt_etc { "filename": `"tz_version"`, "installable": `False`, "src": `select({ - "//build/bazel/platforms/os_arch:android_arm": "arm", - "//build/bazel/platforms/os_arch:android_arm64": "darwin_or_arm64", - "//build/bazel/platforms/os_arch:darwin_arm64": "darwin_or_arm64", - "//build/bazel/platforms/os_arch:darwin_x86_64": "darwin_or_arm64", - "//build/bazel/platforms/os_arch:linux_bionic_arm64": "darwin_or_arm64", + "//build/bazel_common_rules/platforms/os_arch:android_arm": "arm", + "//build/bazel_common_rules/platforms/os_arch:android_arm64": "darwin_or_arm64", + "//build/bazel_common_rules/platforms/os_arch:darwin_arm64": "darwin_or_arm64", + "//build/bazel_common_rules/platforms/os_arch:darwin_x86_64": "darwin_or_arm64", + "//build/bazel_common_rules/platforms/os_arch:linux_bionic_arm64": "darwin_or_arm64", "//conditions:default": "version/tz_version", })`, "dir": `"etc/tz"`, @@ -270,8 +270,8 @@ prebuilt_etc { "filename_from_src": `True`, "dir": `"etc"`, "src": `select({ - "//build/bazel/platforms/arch:arm": "barSrc", - "//build/bazel/platforms/arch:arm64": "bazSrc", + "//build/bazel_common_rules/platforms/arch:arm": "barSrc", + "//build/bazel_common_rules/platforms/arch:arm64": "bazSrc", "//conditions:default": None, })`, })}}) @@ -317,8 +317,8 @@ prebuilt_etc { "filename": `"fooFilename"`, "dir": `"etc"`, "src": `select({ - "//build/bazel/platforms/arch:arm": "armSrc", "//build/bazel/product_config/config_settings:native_coverage-arm": "nativeCoverageArmSrc", + "//build/bazel_common_rules/platforms/arch:arm": "armSrc", "//conditions:default": None, })`, })}}) diff --git a/bp2build/python_binary_conversion_test.go b/bp2build/python_binary_conversion_test.go index b69c4eab7..eb993c2e4 100644 --- a/bp2build/python_binary_conversion_test.go +++ b/bp2build/python_binary_conversion_test.go @@ -56,7 +56,7 @@ func TestPythonBinaryHostSimple(t *testing.T) { "b/d.py", ]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -90,7 +90,7 @@ func TestPythonBinaryHostPy2(t *testing.T) { "imports": `["."]`, "srcs": `["a.py"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -124,7 +124,7 @@ func TestPythonBinaryHostPy3(t *testing.T) { "imports": `["."]`, "srcs": `["a.py"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -156,12 +156,12 @@ func TestPythonBinaryHostArchVariance(t *testing.T) { MakeBazelTarget("py_binary", "foo-arm", AttrNameToString{ "imports": `["."]`, "srcs": `select({ - "//build/bazel/platforms/arch:arm": ["arm.py"], - "//build/bazel/platforms/arch:x86": ["x86.py"], + "//build/bazel_common_rules/platforms/arch:arm": ["arm.py"], + "//build/bazel_common_rules/platforms/arch:x86": ["x86.py"], "//conditions:default": [], })`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -183,7 +183,7 @@ func TestPythonBinaryMainIsNotSpecified(t *testing.T) { MakeBazelTarget("py_binary", "foo", AttrNameToString{ "imports": `["."]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -212,7 +212,7 @@ genrule { "main": `":a"`, "imports": `["."]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -241,7 +241,7 @@ func TestPythonBinaryMainIsSubpackageFile(t *testing.T) { "main": `"//a:b.py"`, "imports": `["."]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -269,7 +269,7 @@ func TestPythonBinaryMainIsSubDirFile(t *testing.T) { "main": `"a/b.py"`, "imports": `["."]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), @@ -311,7 +311,7 @@ python_defaults { ":r2", ]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), diff --git a/bp2build/python_library_conversion_test.go b/bp2build/python_library_conversion_test.go index 497df8091..ad6a27be4 100644 --- a/bp2build/python_library_conversion_test.go +++ b/bp2build/python_library_conversion_test.go @@ -25,7 +25,7 @@ type pythonLibBp2BuildTestCase struct { func convertPythonLibTestCaseToBp2build_Host(tc pythonLibBp2BuildTestCase) Bp2buildTestCase { for i := range tc.expectedBazelTargets { tc.expectedBazelTargets[i].attrs["target_compatible_with"] = `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })` } @@ -296,8 +296,8 @@ func TestPythonArchVariance(t *testing.T) { name: "foo", attrs: AttrNameToString{ "srcs": `select({ - "//build/bazel/platforms/arch:arm": ["arm.py"], - "//build/bazel/platforms/arch:x86": ["x86.py"], + "//build/bazel_common_rules/platforms/arch:arm": ["arm.py"], + "//build/bazel_common_rules/platforms/arch:x86": ["x86.py"], "//conditions:default": [], })`, "srcs_version": `"PY3"`, diff --git a/bp2build/python_test_conversion_test.go b/bp2build/python_test_conversion_test.go index fa2e48507..fca7efbb5 100644 --- a/bp2build/python_test_conversion_test.go +++ b/bp2build/python_test_conversion_test.go @@ -58,7 +58,7 @@ func TestPythonTestHostSimple(t *testing.T) { "b/d.py", ]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, }), diff --git a/bp2build/sh_test_conversion_test.go b/bp2build/sh_test_conversion_test.go index e99d56689..4bea396d1 100644 --- a/bp2build/sh_test_conversion_test.go +++ b/bp2build/sh_test_conversion_test.go @@ -22,11 +22,18 @@ import ( ) func TestShTestSimple(t *testing.T) { - RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) {}, Bp2buildTestCase{ - Description: "sh_test test", - ModuleTypeUnderTest: "sh_test", + RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) { + ctx.RegisterModuleType("filegroup", android.FileGroupFactory) + }, Bp2buildTestCase{ + Description: "sh_test test", + ModuleTypeUnderTest: "sh_test", + StubbedBuildDefinitions: []string{"android.hardware.bluetooth@1.1-service.sim", + "android.hardware.bluetooth@1.1-impl-sim", "libc++", "libcrypto"}, ModuleTypeUnderTestFactory: sh.ShTestFactory, - Blueprint: `sh_test{ + Blueprint: simpleModule("filegroup", "android.hardware.bluetooth@1.1-service.sim") + + simpleModule("filegroup", "android.hardware.bluetooth@1.1-impl-sim") + + simpleModule("filegroup", "libc++") + + simpleModule("filegroup", "libcrypto") + `sh_test{ name: "sts-rootcanal-sidebins", src: "empty.sh", test_suites: [ @@ -47,28 +54,37 @@ func TestShTestSimple(t *testing.T) { }`, ExpectedBazelTargets: []string{ MakeBazelTarget("sh_test", "sts-rootcanal-sidebins", AttrNameToString{ - "srcs": `["empty.sh"]`, + "srcs": `["empty.sh"]`, + "runs_on": `["device"]`, "data": `[ "android.hardware.bluetooth@1.1-service.sim.rc", - "android.hardware.bluetooth@1.1-service.sim", - "android.hardware.bluetooth@1.1-impl-sim", - "libc++", - "libcrypto", + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", + ":libc++", + ":libcrypto", + ]`, + "data_bins": `[ + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", ]`, - "test_config": `"art-gtests-target-install-apex.xml"`, - "test_config_template": `":art-run-test-target-template"`, - "auto_gen_config": "False", - "tags": `["no-remote"]`, + "tags": `["no-remote"]`, })}, }) } func TestShTestHostSimple(t *testing.T) { - RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) {}, Bp2buildTestCase{ - Description: "sh_test_host test", - ModuleTypeUnderTest: "sh_test_host", + RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) { + ctx.RegisterModuleType("filegroup", android.FileGroupFactory) + }, Bp2buildTestCase{ + Description: "sh_test_host test", + ModuleTypeUnderTest: "sh_test_host", + StubbedBuildDefinitions: []string{"android.hardware.bluetooth@1.1-service.sim", + "android.hardware.bluetooth@1.1-impl-sim", "libc++", "libcrypto"}, ModuleTypeUnderTestFactory: sh.ShTestHostFactory, - Blueprint: `sh_test_host{ + Blueprint: simpleModule("filegroup", "android.hardware.bluetooth@1.1-service.sim") + + simpleModule("filegroup", "android.hardware.bluetooth@1.1-impl-sim") + + simpleModule("filegroup", "libc++") + + simpleModule("filegroup", "libcrypto") + `sh_test_host{ name: "sts-rootcanal-sidebins", src: "empty.sh", test_suites: [ @@ -89,32 +105,97 @@ func TestShTestHostSimple(t *testing.T) { }`, ExpectedBazelTargets: []string{ MakeBazelTarget("sh_test", "sts-rootcanal-sidebins", AttrNameToString{ - "srcs": `["empty.sh"]`, + "srcs": `["empty.sh"]`, + "runs_on": `["host_without_device"]`, "data": `[ "android.hardware.bluetooth@1.1-service.sim.rc", - "android.hardware.bluetooth@1.1-service.sim", - "android.hardware.bluetooth@1.1-impl-sim", - "libc++", - "libcrypto", + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", + ":libc++", + ":libcrypto", + ]`, + "data_bins": `[ + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", ]`, - "tags": `["no-remote"]`, - "test_config": `"art-gtests-target-install-apex.xml"`, - "test_config_template": `":art-run-test-target-template"`, - "auto_gen_config": "False", + "tags": `["no-remote"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, })}, }) } -func TestShTestSimpleUnset(t *testing.T) { - RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) {}, Bp2buildTestCase{ - Description: "sh_test test", - ModuleTypeUnderTest: "sh_test", +func TestShTestAutogen(t *testing.T) { + RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) { + ctx.RegisterModuleType("filegroup", android.FileGroupFactory) + }, Bp2buildTestCase{ + Description: "sh_test test", + ModuleTypeUnderTest: "sh_test", + StubbedBuildDefinitions: []string{"android.hardware.bluetooth@1.1-service.sim", + "android.hardware.bluetooth@1.1-impl-sim", "libc++", "libcrypto", "art-run-test-target-template"}, ModuleTypeUnderTestFactory: sh.ShTestFactory, - Blueprint: `sh_test{ + Blueprint: simpleModule("filegroup", "android.hardware.bluetooth@1.1-service.sim") + + simpleModule("filegroup", "android.hardware.bluetooth@1.1-impl-sim") + + simpleModule("filegroup", "libc++") + + simpleModule("filegroup", "libcrypto") + + simpleModule("filegroup", "art-run-test-target-template") + `sh_test{ + name: "sts-rootcanal-sidebins", + src: "empty.sh", + test_suites: [ + "sts", + "sts-lite", + ], + data_bins: [ + "android.hardware.bluetooth@1.1-service.sim", + "android.hardware.bluetooth@1.1-impl-sim" + ], + data: ["android.hardware.bluetooth@1.1-service.sim.rc"], + data_libs: ["libc++","libcrypto"], + test_config: "art-gtests-target-install-apex.xml", + test_config_template: ":art-run-test-target-template", + auto_gen_config: true, + test_options:{tags: ["no-remote"], + }, +}`, + ExpectedBazelTargets: []string{ + MakeBazelTarget("sh_test", "sts-rootcanal-sidebins", AttrNameToString{ + "srcs": `["empty.sh"]`, + "runs_on": `["device"]`, + "auto_generate_test_config": "True", + "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, + "template_test_config": `":art-run-test-target-template"`, + "data": `[ + "android.hardware.bluetooth@1.1-service.sim.rc", + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", + ":libc++", + ":libcrypto", + ]`, + "data_bins": `[ + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", + ]`, + "tags": `["no-remote"]`, + })}, + }) +} + +func TestShTestHostAutogen(t *testing.T) { + RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) { + ctx.RegisterModuleType("filegroup", android.FileGroupFactory) + }, Bp2buildTestCase{ + Description: "sh_test_host test", + ModuleTypeUnderTest: "sh_test_host", + StubbedBuildDefinitions: []string{"android.hardware.bluetooth@1.1-service.sim", + "android.hardware.bluetooth@1.1-impl-sim", "libc++", "libcrypto", "art-run-test-target-template"}, + ModuleTypeUnderTestFactory: sh.ShTestHostFactory, + Blueprint: simpleModule("filegroup", "android.hardware.bluetooth@1.1-service.sim") + + simpleModule("filegroup", "android.hardware.bluetooth@1.1-impl-sim") + + simpleModule("filegroup", "libc++") + + simpleModule("filegroup", "libcrypto") + + simpleModule("filegroup", "art-run-test-target-template") + `sh_test_host{ name: "sts-rootcanal-sidebins", src: "empty.sh", test_suites: [ @@ -127,18 +208,79 @@ func TestShTestSimpleUnset(t *testing.T) { ], data: ["android.hardware.bluetooth@1.1-service.sim.rc"], data_libs: ["libc++","libcrypto"], + test_config: "art-gtests-target-install-apex.xml", + test_config_template: ":art-run-test-target-template", + auto_gen_config: true, test_options:{tags: ["no-remote"], }, }`, ExpectedBazelTargets: []string{ MakeBazelTarget("sh_test", "sts-rootcanal-sidebins", AttrNameToString{ - "srcs": `["empty.sh"]`, + "srcs": `["empty.sh"]`, + "runs_on": `["host_without_device"]`, + "auto_generate_test_config": "True", + "target_compatible_with": `select({ + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], + "//conditions:default": [], + })`, + "template_test_config": `":art-run-test-target-template"`, "data": `[ "android.hardware.bluetooth@1.1-service.sim.rc", + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", + ":libc++", + ":libcrypto", + ]`, + "data_bins": `[ + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", + ]`, + "tags": `["no-remote"]`, + })}, + }) +} +func TestShTestSimpleUnset(t *testing.T) { + RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) { + ctx.RegisterModuleType("filegroup", android.FileGroupFactory) + }, Bp2buildTestCase{ + Description: "sh_test test", + ModuleTypeUnderTest: "sh_test", + StubbedBuildDefinitions: []string{"android.hardware.bluetooth@1.1-service.sim", + "android.hardware.bluetooth@1.1-impl-sim", "libc++", "libcrypto"}, + ModuleTypeUnderTestFactory: sh.ShTestFactory, + Blueprint: simpleModule("filegroup", "android.hardware.bluetooth@1.1-service.sim") + + simpleModule("filegroup", "android.hardware.bluetooth@1.1-impl-sim") + + simpleModule("filegroup", "libc++") + + simpleModule("filegroup", "libcrypto") + `sh_test{ + name: "sts-rootcanal-sidebins", + src: "empty.sh", + test_suites: [ + "sts", + "sts-lite", + ], + data_bins: [ "android.hardware.bluetooth@1.1-service.sim", - "android.hardware.bluetooth@1.1-impl-sim", - "libc++", - "libcrypto", + "android.hardware.bluetooth@1.1-impl-sim" + ], + data: ["android.hardware.bluetooth@1.1-service.sim.rc"], + data_libs: ["libc++","libcrypto"], + test_options:{tags: ["no-remote"], + }, +}`, + ExpectedBazelTargets: []string{ + MakeBazelTarget("sh_test", "sts-rootcanal-sidebins", AttrNameToString{ + "srcs": `["empty.sh"]`, + "runs_on": `["device"]`, + "data": `[ + "android.hardware.bluetooth@1.1-service.sim.rc", + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", + ":libc++", + ":libcrypto", + ]`, + "data_bins": `[ + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", ]`, "tags": `["no-remote"]`, })}, @@ -146,11 +288,18 @@ func TestShTestSimpleUnset(t *testing.T) { } func TestShTestHostSimpleUnset(t *testing.T) { - RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) {}, Bp2buildTestCase{ + RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) { + ctx.RegisterModuleType("filegroup", android.FileGroupFactory) + }, Bp2buildTestCase{ Description: "sh_test_host test", ModuleTypeUnderTest: "sh_test_host", ModuleTypeUnderTestFactory: sh.ShTestHostFactory, - Blueprint: `sh_test_host{ + StubbedBuildDefinitions: []string{"android.hardware.bluetooth@1.1-service.sim", + "android.hardware.bluetooth@1.1-impl-sim", "libc++", "libcrypto"}, + Blueprint: simpleModule("filegroup", "android.hardware.bluetooth@1.1-service.sim") + + simpleModule("filegroup", "android.hardware.bluetooth@1.1-impl-sim") + + simpleModule("filegroup", "libc++") + + simpleModule("filegroup", "libcrypto") + `sh_test_host{ name: "sts-rootcanal-sidebins", src: "empty.sh", test_suites: [ @@ -168,17 +317,22 @@ func TestShTestHostSimpleUnset(t *testing.T) { }`, ExpectedBazelTargets: []string{ MakeBazelTarget("sh_test", "sts-rootcanal-sidebins", AttrNameToString{ - "srcs": `["empty.sh"]`, + "srcs": `["empty.sh"]`, + "runs_on": `["host_without_device"]`, "data": `[ "android.hardware.bluetooth@1.1-service.sim.rc", - "android.hardware.bluetooth@1.1-service.sim", - "android.hardware.bluetooth@1.1-impl-sim", - "libc++", - "libcrypto", + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", + ":libc++", + ":libcrypto", + ]`, + "data_bins": `[ + ":android.hardware.bluetooth@1.1-service.sim", + ":android.hardware.bluetooth@1.1-impl-sim", ]`, "tags": `["no-remote"]`, "target_compatible_with": `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })`, })}, diff --git a/bp2build/soong_config_module_type_conversion_test.go b/bp2build/soong_config_module_type_conversion_test.go index 5ec6bab29..2535cf316 100644 --- a/bp2build/soong_config_module_type_conversion_test.go +++ b/bp2build/soong_config_module_type_conversion_test.go @@ -1207,13 +1207,13 @@ cc_binary { local_includes = ["."], srcs = ["main.cc"], target_compatible_with = select({ - "//build/bazel/platforms/os_arch:android_x86_64": ["@platforms//:incompatible"], - "//build/bazel/platforms/os_arch:darwin_arm64": ["@platforms//:incompatible"], - "//build/bazel/platforms/os_arch:darwin_x86_64": ["@platforms//:incompatible"], - "//build/bazel/platforms/os_arch:linux_bionic_x86_64": ["@platforms//:incompatible"], - "//build/bazel/platforms/os_arch:linux_glibc_x86_64": ["@platforms//:incompatible"], - "//build/bazel/platforms/os_arch:linux_musl_x86_64": ["@platforms//:incompatible"], - "//build/bazel/platforms/os_arch:windows_x86_64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:android_x86_64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:darwin_arm64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:darwin_x86_64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:linux_bionic_x86_64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:linux_glibc_x86_64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:linux_musl_x86_64": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os_arch:windows_x86_64": ["@platforms//:incompatible"], "//conditions:default": [], }) + select({ "//build/bazel/product_config/config_settings:alphabet_module__special_build": [], @@ -1423,7 +1423,7 @@ cc_binary { ExpectedBazelTargets: []string{`cc_binary( name = "my_binary", copts = select({ - "//build/bazel/platforms/os:android": ["-DFOO"], + "//build/bazel_common_rules/platforms/os:android": ["-DFOO"], "//conditions:default": [], }) + select({ "//build/bazel/product_config/config_settings:my_namespace__my_bool_variable__android": ["-DBAR"], @@ -1440,7 +1440,7 @@ cc_binary { }), local_includes = ["."], srcs = ["main.cc"], - target_compatible_with = ["//build/bazel/platforms/os:android"], + target_compatible_with = ["//build/bazel_common_rules/platforms/os:android"], )`}}) } diff --git a/bp2build/testing.go b/bp2build/testing.go index 690748756..b2804f909 100644 --- a/bp2build/testing.go +++ b/bp2build/testing.go @@ -124,12 +124,6 @@ type Bp2buildTestCase struct { // be merged with the generated BUILD file. This allows custom BUILD targets // to be used in tests, or use BUILD files to draw package boundaries. KeepBuildFileForDirs []string - - // If true, the bp2build_deps mutator is used for this test. This is an - // experimental mutator that will disable modules which have transitive - // dependencies with no bazel definition. - // TODO: b/285631638 - Enable this feature by default. - DepsMutator bool } func RunBp2BuildTestCaseExtraContext(t *testing.T, registerModuleTypes func(ctx android.RegistrationContext), modifyContext func(ctx *android.TestContext), tc Bp2buildTestCase) { @@ -140,11 +134,6 @@ func RunBp2BuildTestCaseExtraContext(t *testing.T, registerModuleTypes func(ctx if modifyContext != nil { preparers = append(preparers, android.FixtureModifyContext(modifyContext)) } - if tc.DepsMutator { - preparers = append(preparers, android.FixtureModifyConfig(func(cfg android.Config) { - cfg.Bp2buildDepsMutator = true - })) - } preparers = append(preparers, SetBp2BuildTestRunner) bp2buildSetup := android.GroupFixturePreparers( preparers..., @@ -693,11 +682,11 @@ func makeBazelTargetHostOrDevice(typ, name string, attrs AttrNameToString, hod a switch hod { case android.HostSupported: attrs["target_compatible_with"] = `select({ - "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], })` case android.DeviceSupported: - attrs["target_compatible_with"] = `["//build/bazel/platforms/os:android"]` + attrs["target_compatible_with"] = `["//build/bazel_common_rules/platforms/os:android"]` } } diff --git a/cc/bp2build.go b/cc/bp2build.go index ec5d5225b..57333b85e 100644 --- a/cc/bp2build.go +++ b/cc/bp2build.go @@ -1514,7 +1514,7 @@ func createInApexConfigSetting(ctx android.Bp2buildMutatorContext, apexName stri Constraint_values: bazel.MakeLabelListAttribute( bazel.MakeLabelList( []bazel.Label{ - bazel.Label{Label: "//build/bazel/platforms/os:android"}, + bazel.Label{Label: "//build/bazel_common_rules/platforms/os:android"}, }, ), ), diff --git a/genrule/allowlists.go b/genrule/allowlists.go index 9647a18a4..8c78528ed 100644 --- a/genrule/allowlists.go +++ b/genrule/allowlists.go @@ -16,152 +16,208 @@ package genrule var ( DepfileAllowList = []string{ + // go/keep-sorted start "depfile_allowed_for_test", - "tflite_support_metadata_schema", - "tflite_support_spm_config", - "tflite_support_spm_encoder_config", "gen_uwb_core_proto", - "libtextclassifier_fbgen_utils_flatbuffers_flatbuffers_test", - "libtextclassifier_fbgen_utils_lua_utils_tests", - "libtextclassifier_fbgen_lang_id_common_flatbuffers_model", - "libtextclassifier_fbgen_lang_id_common_flatbuffers_embedding-network", + "libtextclassifier_fbgen_actions_actions-entity-data", + "libtextclassifier_fbgen_actions_actions_model", "libtextclassifier_fbgen_annotator_datetime_datetime", - "libtextclassifier_fbgen_annotator_model", - "libtextclassifier_fbgen_annotator_experimental_experimental", "libtextclassifier_fbgen_annotator_entity-data", + "libtextclassifier_fbgen_annotator_experimental_experimental", + "libtextclassifier_fbgen_annotator_model", "libtextclassifier_fbgen_annotator_person_name_person_name_model", - "libtextclassifier_fbgen_utils_tflite_text_encoder_config", + "libtextclassifier_fbgen_lang_id_common_flatbuffers_embedding-network", + "libtextclassifier_fbgen_lang_id_common_flatbuffers_model", "libtextclassifier_fbgen_utils_codepoint-range", - "libtextclassifier_fbgen_utils_intents_intent-config", + "libtextclassifier_fbgen_utils_container_bit-vector", "libtextclassifier_fbgen_utils_flatbuffers_flatbuffers", - "libtextclassifier_fbgen_utils_zlib_buffer", - "libtextclassifier_fbgen_utils_tokenizer", + "libtextclassifier_fbgen_utils_flatbuffers_flatbuffers_test", "libtextclassifier_fbgen_utils_grammar_rules", "libtextclassifier_fbgen_utils_grammar_semantics_expression", - "libtextclassifier_fbgen_utils_resources", + "libtextclassifier_fbgen_utils_grammar_testing_value", "libtextclassifier_fbgen_utils_i18n_language-tag", + "libtextclassifier_fbgen_utils_intents_intent-config", + "libtextclassifier_fbgen_utils_lua_utils_tests", "libtextclassifier_fbgen_utils_normalization", - "libtextclassifier_fbgen_utils_container_bit-vector", - "libtextclassifier_fbgen_actions_actions-entity-data", - "libtextclassifier_fbgen_actions_actions_model", - "libtextclassifier_fbgen_utils_grammar_testing_value", + "libtextclassifier_fbgen_utils_resources", + "libtextclassifier_fbgen_utils_tflite_text_encoder_config", + "libtextclassifier_fbgen_utils_tokenizer", + "libtextclassifier_fbgen_utils_zlib_buffer", + "tflite_support_metadata_schema", + "tflite_support_spm_config", + "tflite_support_spm_encoder_config", + // go/keep-sorted end } SandboxingDenyModuleList = []string{ - "RsBalls-rscript", - "pvmfw_fdt_template_rs", - "RSTest_v14-rscript", - "com.android.apex.test.bar_stripped", - "com.android.apex.test.sharedlibs_secondary_generated", - "ImageProcessingJB-rscript", - "RSTest-rscript", - "BluetoothGeneratedDumpsysBinarySchema_bfbs", - "TracingVMProtoStub_h", - "VehicleServerProtoStub_cc", + // go/keep-sorted start "AudioFocusControlProtoStub_cc", "AudioFocusControlProtoStub_h", - "TracingVMProtoStub_cc", - "VehicleServerProtoStub_h", - "hidl2aidl_translate_cpp_test_gen_headers", - "hidl2aidl_translate_cpp_test_gen_src", - "hidl2aidl_translate_java_test_gen_src", - "hidl2aidl_translate_ndk_test_gen_headers", - "hidl2aidl_translate_ndk_test_gen_src", - "hidl_hash_test_gen", - "nos_app_avb_service_genc++", - "nos_app_avb_service_genc++_headers", - "nos_app_avb_service_genc++_mock", - "nos_app_identity_service_genc++", - "nos_app_keymaster_service_genc++", - "nos_generator_test_service_genc++_headers", - "nos_generator_test_service_genc++_mock", - "r8retrace-run-retrace", - "ltp_config_arm", - "ltp_config_arm_64_hwasan", - "ltp_config_arm_lowmem", - "ltp_config_arm_64", - "ltp_config_riscv_64", - "ltp_config_x86_64", - "vm-tests-tf-lib", - "hidl_cpp_impl_test_gen-headers", - "Refocus-rscript", - "RSTest_v11-rscript", - "RSTest_v16-rscript", - "ScriptGroupTest-rscript", - "ImageProcessing2-rscript", - "ImageProcessing-rscript", - "com.android.apex.test.pony_stripped", - "com.android.apex.test.baz_stripped", - "com.android.apex.test.foo_stripped", - "com.android.apex.test.sharedlibs_generated", "BlueberryFacadeAndCertGeneratedStub_py", "BlueberryFacadeGeneratedStub_cc", "BlueberryFacadeGeneratedStub_h", + "BluetoothGeneratedDumpsysBinarySchema_bfbs", "BluetoothGeneratedDumpsysDataSchema_h", - "c2hal_test_genc++", - "c2hal_test_genc++_headers", - "hidl2aidl_test_gen_aidl", - "hidl_error_test_gen", - "hidl_export_test_gen-headers", - "hidl_format_test_diff", - "hidl_hash_version_gen", - "libbt_topshim_facade_py_proto", - "nos_app_identity_service_genc++_headers", - "nos_app_identity_service_genc++_mock", - "nos_app_keymaster_service_genc++_headers", - "nos_app_keymaster_service_genc++_mock", - "nos_app_weaver_service_genc++", - "nos_app_weaver_service_genc++_headers", - "nos_app_weaver_service_genc++_mock", - "nos_generator_test_service_genc++", - "aidl_camera_build_version", - "cronet_aml_base_android_runtime_unchecked_jni_headers", - "cronet_aml_base_android_runtime_jni_headers", - "aidl-golden-test-build-hook-gen", - "PacketStreamerStub_h", + "ControlEnvProxyServerProto_cc", + "ControlEnvProxyServerProto_h", + "CtsApkVerityTestDebugFiles", "FrontendStub_cc", "FrontendStub_h", + "HeadlessBuildTimestamp", + "ImageProcessing-rscript", + "ImageProcessing2-rscript", + "ImageProcessingJB-rscript", + "MultiDexLegacyTestApp_genrule", + "PackageManagerServiceServerTests_apks_as_resources", "PacketStreamerStub_cc", - "pixelstatsatoms.h", - "pixelatoms_defs.h", - "pixelstatsatoms.cpp", - "hidl_java_impl_test_gen", + "PacketStreamerStub_h", + "RSTest-rscript", + "RSTest_v11-rscript", + "RSTest_v14-rscript", + "RSTest_v16-rscript", + "Refocus-rscript", + "RsBalls-rscript", + "ScriptGroupTest-rscript", + "TracingVMProtoStub_cc", + "TracingVMProtoStub_h", + "UpdatableSystemFontTest_NotoColorEmojiV0.sig", + "UpdatableSystemFontTest_NotoColorEmojiV0.ttf", + "UpdatableSystemFontTest_NotoColorEmojiVPlus1.sig", + "UpdatableSystemFontTest_NotoColorEmojiVPlus1.ttf", + "UpdatableSystemFontTest_NotoColorEmojiVPlus2.sig", + "UpdatableSystemFontTest_NotoColorEmojiVPlus2.ttf", + "VehicleServerProtoStub_cc", + "VehicleServerProtoStub_cc@2.0-grpc-trout", + "VehicleServerProtoStub_cc@default-grpc", + "VehicleServerProtoStub_h", + "VehicleServerProtoStub_h@2.0-grpc-trout", + "VehicleServerProtoStub_h@default-grpc", + "aidl-golden-test-build-hook-gen", + "aidl_camera_build_version", + "android-cts-verifier", + "android-support-multidex-instrumentation-version", + "android-support-multidex-version", + "angle_commit_id", + "apexer_test_host_tools", + "atest_integration_fake_src", + "authfs_test_apk_assets", + "awkgram.tab.h", + "bluetooth_core_rust_packets", + "c2hal_test_genc++", + "c2hal_test_genc++_headers", + "camera-its", + "checkIn-service-stub-lite", + "chre_atoms_log.h", + "com.android.apex.apkrollback.test.pem", + "com.android.apex.apkrollback.test.pubkey", + "com.android.apex.cts.shim.debug.pem", + "com.android.apex.cts.shim.debug.pubkey", + "com.android.apex.cts.shim.pem", + "com.android.apex.cts.shim.pubkey", + "com.android.apex.cts.shim.v2_no_pb", + "com.android.apex.cts.shim.v2_signed_bob", + "com.android.apex.cts.shim.v2_signed_bob_rot", + "com.android.apex.cts.shim.v2_signed_bob_rot_rollback", + "com.android.apex.cts.shim.v2_unsigned_apk_container", + "com.android.apex.cts.shim.v3_signed_bob", + "com.android.apex.cts.shim.v3_signed_bob_rot", + "com.android.apex.cts.shim_not_pre_installed.pem", + "com.android.apex.cts.shim_not_pre_installed.pubkey", + "com.android.apex.rotation.key.bob.pem", + "com.android.apex.rotation.key.bob.pk8", + "com.android.apex.rotation.key.bob.rot", + "com.android.apex.rotation.key.bob.rot.rollback", + "com.android.apex.rotation.key.bob.x509.pem", + "com.android.apex.test.bar_stripped", + "com.android.apex.test.baz_stripped", + "com.android.apex.test.foo_stripped", + "com.android.apex.test.pony_stripped", + "com.android.apex.test.sharedlibs_generated", + "com.android.apex.test.sharedlibs_secondary_generated", + "com.android.overlaytest.overlaid.pem", + "com.android.overlaytest.overlaid.pubkey", + "com.android.overlaytest.overlay.pem", + "com.android.overlaytest.overlay.pubkey", + "common-profile-text-protos", + "core-tests-smali-dex", + "cronet_aml_base_android_runtime_jni_headers", "cronet_aml_base_android_runtime_jni_headers__testing", + "cronet_aml_base_android_runtime_unchecked_jni_headers", "cronet_aml_base_android_runtime_unchecked_jni_headers__testing", - "hidl_cpp_impl_test_gen-sources", - "fdt_test_tree_multiple_memory_ranges_dtb", - "fdt_test_tree_one_memory_range_dtb", - "fdt_test_tree_empty_memory_range_dtb", - "ltp_config_arm_64_lowmem", - "ltp_config_arm_64_lowmem_hwasan", - "ltp_config_x86", - "libbssl_sys_src_nostd", - "libcore-non-cts-tests-txt", - "ControlEnvProxyServerProto_cc", - "ControlEnvProxyServerProto_h", - "camera-its", - "android-cts-verifier", - "CtsApkVerityTestDebugFiles", - "vm-tests-tf-lib", + "deqp_spvtools_update_build_version", "egl_extensions_functions_hdr", "egl_functions_hdr", + "emp_ematch.yacc.c", + "emp_ematch.yacc.h", + "fdt_test_tree_empty_memory_range_dtb", + "fdt_test_tree_multiple_memory_ranges_dtb", + "fdt_test_tree_one_memory_range_dtb", + "futility_cmds", + "gd_hci_packets_python3_gen", + "gd_smp_packets_python3_gen", + "gen_corrupt_rebootless_apex", + "gen_corrupt_superblock_apex", + "gen_key_mismatch_capex", + "gen_manifest_mismatch_apex_no_hashtree", + "generate_hash_v1", "gles1_core_functions_hdr", "gles1_extensions_functions_hdr", "gles2_core_functions_hdr", "gles2_extensions_functions_hdr", "gles31_only_functions_hdr", "gles3_only_functions_hdr", - "angle_commit_id", - "deqp_spvtools_update_build_version", - "emp_ematch.yacc.c", - "emp_ematch.yacc.h", + "hci_packets_python3_gen", + "hidl2aidl_test_gen_aidl", + "hidl2aidl_translate_cpp_test_gen_headers", + "hidl2aidl_translate_cpp_test_gen_src", + "hidl2aidl_translate_java_test_gen_src", + "hidl2aidl_translate_ndk_test_gen_headers", + "hidl2aidl_translate_ndk_test_gen_src", + "hidl_cpp_impl_test_gen-headers", + "hidl_cpp_impl_test_gen-sources", + "hidl_error_test_gen", + "hidl_export_test_gen-headers", + "hidl_format_test_diff", + "hidl_hash_test_gen", + "hidl_hash_version_gen", + "hidl_java_impl_test_gen", + "lib-test-profile-text-protos", + "libbssl_sys_src_nostd", + "libbt_topshim_facade_py_proto", + "libc_musl_sysroot_bits", "libchrome-crypto-include", "libchrome-include", + "libcore-non-cts-tests-txt", "libmojo_jni_headers", "libxml2_schema_fuzz_corpus", "libxml2_xml_fuzz_corpus", - "libc_musl_sysroot_bits", - "awkgram.tab.h", + "link_layer_packets_python3_gen", + "llcp_packets_python3_gen", + "ltp_config_arm", + "ltp_config_arm_64", + "ltp_config_arm_64_hwasan", + "ltp_config_arm_64_lowmem", + "ltp_config_arm_64_lowmem_hwasan", + "ltp_config_arm_lowmem", + "ltp_config_riscv_64", + "ltp_config_x86", + "ltp_config_x86_64", + "measure_io_as_jar", + "nos_app_avb_service_genc++", + "nos_app_avb_service_genc++_headers", + "nos_app_avb_service_genc++_mock", + "nos_app_identity_service_genc++", + "nos_app_identity_service_genc++_headers", + "nos_app_identity_service_genc++_mock", + "nos_app_keymaster_service_genc++", + "nos_app_keymaster_service_genc++_headers", + "nos_app_keymaster_service_genc++_mock", + "nos_app_weaver_service_genc++", + "nos_app_weaver_service_genc++_headers", + "nos_app_weaver_service_genc++_mock", + "nos_generator_test_service_genc++", + "nos_generator_test_service_genc++_headers", + "nos_generator_test_service_genc++_mock", "openwrt_rootfs_combined_aarch64", "openwrt_rootfs_combined_x86_64", "openwrt_rootfs_customization_aarch64", @@ -175,93 +231,36 @@ var ( "pdl_python_generator_le_test_gen", "pdl_rust_noalloc_le_test_backend_srcs", "pdl_rust_noalloc_le_test_gen_harness", - "swiftshader_spvtools_update_build_version", - "uwb_core_artifacts", - "futility_cmds", - "MultiDexLegacyTestApp_genrule", - "com.android.overlaytest.overlaid.pem", - "com.android.overlaytest.overlaid.pubkey", - "com.android.overlaytest.overlay.pem", - "com.android.overlaytest.overlay.pubkey", - "wm_shell_protolog_src", - "services.core.protologsrc", - "PackageManagerServiceServerTests_apks_as_resources", - "wmtests.protologsrc", - "com.android.apex.apkrollback.test.pem", - "com.android.apex.apkrollback.test.pubkey", - "UpdatableSystemFontTest_NotoColorEmojiV0.sig", - "UpdatableSystemFontTest_NotoColorEmojiV0.ttf", - "UpdatableSystemFontTest_NotoColorEmojiVPlus1.sig", - "UpdatableSystemFontTest_NotoColorEmojiVPlus1.ttf", - "UpdatableSystemFontTest_NotoColorEmojiVPlus2.sig", - "UpdatableSystemFontTest_NotoColorEmojiVPlus2.ttf", - "temp_layoutlib", - "android-support-multidex-instrumentation-version", - "android-support-multidex-version", - "core-tests-smali-dex", - "gd_hci_packets_python3_gen", - "gd_smp_packets_python3_gen", - "bluetooth_core_rust_packets", - "HeadlessBuildTimestamp", - "hci_packets_python3_gen", - "link_layer_packets_python3_gen", - "llcp_packets_python3_gen", + "pixelatoms_defs.h", + "pixelstatsatoms.cpp", + "pixelstatsatoms.h", + "pvmfw_fdt_template_rs", + "r8retrace-dexdump-sample-app", + "r8retrace-run-retrace", "rootcanal_bredr_bb_packets_cxx_gen", "rootcanal_hci_packets_cxx_gen", "rootcanal_link_layer_packets_cxx_gen", - "authfs_test_apk_assets", - "measure_io_as_jar", - "statsd-config-protos", - "statsd-config-protos", "sample-profile-text-protos", - "sample-profile-text-protos", - "lib-test-profile-text-protos", - "lib-test-profile-text-protos", - "common-profile-text-protos", - "common-profile-text-protos", - "vndk_abi_dump_zip", - "r8retrace-dexdump-sample-app", - "gen_key_mismatch_capex", - "gen_corrupt_rebootless_apex", - "gen_corrupt_superblock_apex", - "gen_manifest_mismatch_apex_no_hashtree", - "apexer_test_host_tools", - "com.android.apex.cts.shim.debug.pem", - "com.android.apex.cts.shim.debug.pubkey", - "com.android.apex.cts.shim.pem", - "com.android.apex.cts.shim.pubkey", - "com.android.apex.cts.shim.v2_no_pb", - "com.android.apex.cts.shim.v2_signed_bob", - "com.android.apex.cts.shim.v2_signed_bob_rot", - "com.android.apex.cts.shim.v2_signed_bob_rot_rollback", - "com.android.apex.cts.shim.v2_unsigned_apk_container", - "com.android.apex.cts.shim.v3_signed_bob", - "com.android.apex.cts.shim.v3_signed_bob_rot", - "com.android.apex.cts.shim_not_pre_installed.pem", - "com.android.apex.cts.shim_not_pre_installed.pubkey", - "com.android.apex.rotation.key.bob.pem", - "com.android.apex.rotation.key.bob.pk8", - "com.android.apex.rotation.key.bob.rot.rollback", - "com.android.apex.rotation.key.bob.rot", - "com.android.apex.rotation.key.bob.x509.pem", - "generate_hash_v1", - "ue_unittest_erofs_imgs", - "ue_unittest_erofs_imgs", + "seller-frontend-service-stub-lite", + "services.core.protologsrc", + "statsd-config-protos", + "swiftshader_spvtools_update_build_version", + "temp_layoutlib", "ue_unittest_erofs_imgs", + "uwb_core_artifacts", + "vm-tests-tf-lib", + "vndk_abi_dump_zip", "vts_vndk_abi_dump_zip", - "atest_integration_fake_src", - "VehicleServerProtoStub_cc@2.0-grpc-trout", - "VehicleServerProtoStub_cc@default-grpc", - "VehicleServerProtoStub_h@default-grpc", - "VehicleServerProtoStub_h@2.0-grpc-trout", - "chre_atoms_log.h", - "checkIn-service-stub-lite", - "seller-frontend-service-stub-lite", + "wm_shell_protolog_src", + "wmtests.protologsrc", + // go/keep-sorted end } SandboxingDenyPathList = []string{ + // go/keep-sorted start "art/test", - "external/perfetto", "external/cronet", + "external/perfetto", + // go/keep-sorted end } ) diff --git a/java/aar.go b/java/aar.go index 44496dc57..e53653a92 100644 --- a/java/aar.go +++ b/java/aar.go @@ -301,23 +301,29 @@ var extractAssetsRule = pctx.AndroidStaticRule("extractAssets", CommandDeps: []string{"${config.Zip2ZipCmd}"}, }) -func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext android.SdkContext, - classLoaderContexts dexpreopt.ClassLoaderContextMap, excludedLibs []string, - enforceDefaultTargetSdkVersion bool, extraLinkFlags ...string) { +type aaptBuildActionOptions struct { + sdkContext android.SdkContext + classLoaderContexts dexpreopt.ClassLoaderContextMap + excludedLibs []string + enforceDefaultTargetSdkVersion bool + extraLinkFlags []string +} + +func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptions) { staticResourcesNodesDepSet, staticRRODirsDepSet, staticManifestsDepSet, sharedDeps, libFlags := - aaptLibs(ctx, sdkContext, classLoaderContexts) + aaptLibs(ctx, opts.sdkContext, opts.classLoaderContexts) // Exclude any libraries from the supplied list. - classLoaderContexts = classLoaderContexts.ExcludeLibs(excludedLibs) + opts.classLoaderContexts = opts.classLoaderContexts.ExcludeLibs(opts.excludedLibs) // App manifest file manifestFile := proptools.StringDefault(a.aaptProperties.Manifest, "AndroidManifest.xml") manifestSrcPath := android.PathForModuleSrc(ctx, manifestFile) manifestPath := ManifestFixer(ctx, manifestSrcPath, ManifestFixerParams{ - SdkContext: sdkContext, - ClassLoaderContexts: classLoaderContexts, + SdkContext: opts.sdkContext, + ClassLoaderContexts: opts.classLoaderContexts, IsLibrary: a.isLibrary, DefaultManifestVersion: a.defaultManifestVersion, UseEmbeddedNativeLibs: a.useEmbeddedNativeLibs, @@ -325,7 +331,7 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext android.SdkCon UseEmbeddedDex: a.useEmbeddedDex, HasNoCode: a.hasNoCode, LoggingParent: a.LoggingParent, - EnforceDefaultTargetSdkVersion: enforceDefaultTargetSdkVersion, + EnforceDefaultTargetSdkVersion: opts.enforceDefaultTargetSdkVersion, }) staticDeps := transitiveAarDeps(staticResourcesNodesDepSet.ToList()) @@ -341,7 +347,10 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext android.SdkCon transitiveManifestPaths = append(transitiveManifestPaths, staticManifestsDepSet.ToList()...) if len(transitiveManifestPaths) > 1 && !Bool(a.aaptProperties.Dont_merge_manifests) { - a.mergedManifestFile = manifestMerger(ctx, transitiveManifestPaths[0], transitiveManifestPaths[1:], a.isLibrary) + manifestMergerParams := ManifestMergerParams{ + staticLibManifests: transitiveManifestPaths[1:], + isLibrary: a.isLibrary} + a.mergedManifestFile = manifestMerger(ctx, transitiveManifestPaths[0], manifestMergerParams) if !a.isLibrary { // Only use the merged manifest for applications. For libraries, the transitive closure of manifests // will be propagated to the final application and merged there. The merged manifest for libraries is @@ -352,12 +361,12 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext android.SdkCon a.mergedManifestFile = manifestPath } - compileFlags, linkFlags, linkDeps, resDirs, overlayDirs, rroDirs, resZips := a.aapt2Flags(ctx, sdkContext, manifestPath) + compileFlags, linkFlags, linkDeps, resDirs, overlayDirs, rroDirs, resZips := a.aapt2Flags(ctx, opts.sdkContext, manifestPath) linkFlags = append(linkFlags, libFlags...) linkDeps = append(linkDeps, sharedDeps...) linkDeps = append(linkDeps, staticDeps.resPackages()...) - linkFlags = append(linkFlags, extraLinkFlags...) + linkFlags = append(linkFlags, opts.extraLinkFlags...) if a.isLibrary { linkFlags = append(linkFlags, "--static-lib") } @@ -729,7 +738,13 @@ func (a *AndroidLibrary) DepsMutator(ctx android.BottomUpMutatorContext) { func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.aapt.isLibrary = true a.classLoaderContexts = a.usesLibrary.classLoaderContextForUsesLibDeps(ctx) - a.aapt.buildActions(ctx, android.SdkContext(a), a.classLoaderContexts, nil, false) + a.aapt.buildActions(ctx, + aaptBuildActionOptions{ + sdkContext: android.SdkContext(a), + classLoaderContexts: a.classLoaderContexts, + enforceDefaultTargetSdkVersion: false, + }, + ) a.hideApexVariantFromMake = !ctx.Provider(android.ApexInfoProvider).(android.ApexInfo).IsForPlatform() diff --git a/java/android_manifest.go b/java/android_manifest.go index f2ebfa6a2..a39c00251 100644 --- a/java/android_manifest.go +++ b/java/android_manifest.go @@ -200,11 +200,16 @@ func ManifestFixer(ctx android.ModuleContext, manifest android.Path, return fixedManifest.WithoutRel() } -func manifestMerger(ctx android.ModuleContext, manifest android.Path, staticLibManifests android.Paths, - isLibrary bool) android.Path { +type ManifestMergerParams struct { + staticLibManifests android.Paths + isLibrary bool +} + +func manifestMerger(ctx android.ModuleContext, manifest android.Path, + params ManifestMergerParams) android.Path { var args string - if !isLibrary { + if !params.isLibrary { // Follow Gradle's behavior, only pass --remove-tools-declarations when merging app manifests. args = "--remove-tools-declarations" } @@ -214,10 +219,10 @@ func manifestMerger(ctx android.ModuleContext, manifest android.Path, staticLibM Rule: manifestMergerRule, Description: "merge manifest", Input: manifest, - Implicits: staticLibManifests, + Implicits: params.staticLibManifests, Output: mergedManifest, Args: map[string]string{ - "libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--libs "), + "libs": android.JoinWithPrefix(params.staticLibManifests.Strings(), "--libs "), "args": args, }, }) diff --git a/java/app.go b/java/app.go index 166c22d94..ce94ababd 100755 --- a/java/app.go +++ b/java/app.go @@ -481,8 +481,15 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) { if a.Updatable() { a.aapt.defaultManifestVersion = android.DefaultUpdatableModuleVersion } - a.aapt.buildActions(ctx, android.SdkContext(a), a.classLoaderContexts, - a.usesLibraryProperties.Exclude_uses_libs, a.enforceDefaultTargetSdkVersion(), aaptLinkFlags...) + a.aapt.buildActions(ctx, + aaptBuildActionOptions{ + android.SdkContext(a), + a.classLoaderContexts, + a.usesLibraryProperties.Exclude_uses_libs, + a.enforceDefaultTargetSdkVersion(), + aaptLinkFlags, + }, + ) // apps manifests are handled by aapt, don't let Module see them a.properties.Manifest = nil diff --git a/java/dex.go b/java/dex.go index 348c93921..9ce5053fd 100644 --- a/java/dex.go +++ b/java/dex.go @@ -106,15 +106,12 @@ func (d *dexer) effectiveOptimizeEnabled() bool { var d8, d8RE = pctx.MultiCommandRemoteStaticRules("d8", blueprint.RuleParams{ Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + - `mkdir -p $$(dirname $tmpJar) && ` + - `${config.Zip2ZipCmd} -i $in -o $tmpJar -x '**/*.dex' && ` + - `$d8Template${config.D8Cmd} ${config.D8Flags} --output $outDir $d8Flags $tmpJar && ` + + `$d8Template${config.D8Cmd} ${config.D8Flags} --output $outDir $d8Flags --no-dex-input-jar $in && ` + `$zipTemplate${config.SoongZipCmd} $zipFlags -o $outDir/classes.dex.jar -C $outDir -f "$outDir/classes*.dex" && ` + `${config.MergeZipsCmd} -D -stripFile "**/*.class" $mergeZipsFlags $out $outDir/classes.dex.jar $in && ` + - `rm -f "$tmpJar" "$outDir/classes*.dex" "$outDir/classes.dex.jar"`, + `rm -f "$outDir/classes*.dex" "$outDir/classes.dex.jar"`, CommandDeps: []string{ "${config.D8Cmd}", - "${config.Zip2ZipCmd}", "${config.SoongZipCmd}", "${config.MergeZipsCmd}", }, @@ -133,7 +130,7 @@ var d8, d8RE = pctx.MultiCommandRemoteStaticRules("d8", ExecStrategy: "${config.RED8ExecStrategy}", Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, }, - }, []string{"outDir", "d8Flags", "zipFlags", "tmpJar", "mergeZipsFlags"}, nil) + }, []string{"outDir", "d8Flags", "zipFlags", "mergeZipsFlags"}, nil) var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8", blueprint.RuleParams{ @@ -157,7 +154,6 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8", Deps: blueprint.DepsGCC, CommandDeps: []string{ "${config.R8Cmd}", - "${config.Zip2ZipCmd}", "${config.SoongZipCmd}", "${config.MergeZipsCmd}", }, @@ -424,7 +420,6 @@ func (d *dexer) compileDex(ctx android.ModuleContext, dexParams *compileDexParam Args: args, }) } else { - tmpJar := android.PathForModuleOut(ctx, "withres-withoutdex", dexParams.jarName) d8Flags, d8Deps := d8Flags(dexParams.flags) d8Deps = append(d8Deps, commonDeps...) rule := d8 @@ -441,7 +436,6 @@ func (d *dexer) compileDex(ctx android.ModuleContext, dexParams *compileDexParam "d8Flags": strings.Join(append(commonFlags, d8Flags...), " "), "zipFlags": zipFlags, "outDir": outDir.String(), - "tmpJar": tmpJar.String(), "mergeZipsFlags": mergeZipsFlags, }, }) diff --git a/java/droidstubs.go b/java/droidstubs.go index b059c0abf..5432ce7f5 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -538,7 +538,9 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi // Force metalava to sort overloaded methods by their order in the source code. // See b/285312164 for more information. - cmd.FlagWithArg("--format-defaults ", "overloaded-method-order=source") + // And add concrete overrides of abstract methods, see b/299366704 for more + // information. + cmd.FlagWithArg("--format-defaults ", "overloaded-method-order=source,add-additional-overrides=yes") if ctx.DeviceConfig().HideFlaggedApis() { cmd.FlagWithArg("--hide-annotation ", "android.annotation.FlaggedApi") diff --git a/java/java.go b/java/java.go index bde35e87a..35fd7c2b8 100644 --- a/java/java.go +++ b/java/java.go @@ -1087,6 +1087,10 @@ func (j *JavaTestImport) InstallInTestcases() bool { return true } +func (j *TestHost) IsNativeCoverageNeeded(ctx android.BaseModuleContext) bool { + return ctx.DeviceConfig().NativeCoverageEnabled() +} + func (j *TestHost) addDataDeviceBinsDeps(ctx android.BottomUpMutatorContext) { if len(j.testHostProperties.Data_device_bins_first) > 0 { deviceVariations := ctx.Config().AndroidFirstDeviceTarget.Variations() diff --git a/java/rro.go b/java/rro.go index 53faca069..3e0f8e94d 100644 --- a/java/rro.go +++ b/java/rro.go @@ -146,7 +146,13 @@ func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleC aaptLinkFlags = append(aaptLinkFlags, "--rename-overlay-category "+*r.overridableProperties.Category) } - r.aapt.buildActions(ctx, r, nil, nil, false, aaptLinkFlags...) + r.aapt.buildActions(ctx, + aaptBuildActionOptions{ + sdkContext: r, + enforceDefaultTargetSdkVersion: false, + extraLinkFlags: aaptLinkFlags, + }, + ) // Sign the built package _, _, certificates := collectAppDeps(ctx, r, false, false) diff --git a/java/testing.go b/java/testing.go index 98bea7f14..446135116 100644 --- a/java/testing.go +++ b/java/testing.go @@ -73,10 +73,15 @@ var prepareForTestWithFrameworkDeps = android.GroupFixturePreparers( // Needed for various deps defined in GatherRequiredDepsForTest() defaultJavaDir + "/a.java": nil, defaultJavaDir + "/api/current.txt": nil, + defaultJavaDir + "/api/removed.txt": nil, defaultJavaDir + "/api/system-current.txt": nil, + defaultJavaDir + "/api/system-removed.txt": nil, defaultJavaDir + "/api/test-current.txt": nil, + defaultJavaDir + "/api/test-removed.txt": nil, defaultJavaDir + "/api/module-lib-current.txt": nil, + defaultJavaDir + "/api/module-lib-removed.txt": nil, defaultJavaDir + "/api/system-server-current.txt": nil, + defaultJavaDir + "/api/system-server-removed.txt": nil, // Needed for R8 rules on apps "build/make/core/proguard.flags": nil, @@ -410,6 +415,7 @@ func gatherRequiredDepsForTest() string { "stub-annotations", "aconfig-annotations-lib", + "unsupportedappusage", } for _, extra := range extraModules { @@ -424,80 +430,96 @@ func gatherRequiredDepsForTest() string { `, extra) } - type apiContributionStruct struct { - name string - apiSurface string - apiFile string + type droidstubsStruct struct { + name string + apiSurface string + apiFile string + removedFile string } - var publicApiContribution = apiContributionStruct{ - name: "api-stubs-docs-non-updatable.api.contribution", - apiSurface: "public", - apiFile: "api/current.txt", + var publicDroidstubs = droidstubsStruct{ + name: "api-stubs-docs-non-updatable", + apiSurface: "public", + apiFile: "api/current.txt", + removedFile: "api/removed.txt", } - var systemApiContribution = apiContributionStruct{ - name: "system-api-stubs-docs-non-updatable.api.contribution", - apiSurface: "system", - apiFile: "api/system-current.txt", + var systemDroidstubs = droidstubsStruct{ + name: "system-api-stubs-docs-non-updatable", + apiSurface: "system", + apiFile: "api/system-current.txt", + removedFile: "api/system-removed.txt", } - var testApiContribution = apiContributionStruct{ - name: "test-api-stubs-docs-non-updatable.api.contribution", - apiSurface: "test", - apiFile: "api/test-current.txt", + var testDroidstubs = droidstubsStruct{ + name: "test-api-stubs-docs-non-updatable", + apiSurface: "test", + apiFile: "api/test-current.txt", + removedFile: "api/test-removed.txt", } - var moduleLibApiContribution = apiContributionStruct{ - name: "module-lib-api-stubs-docs-non-updatable.api.contribution", - apiSurface: "module-lib", - apiFile: "api/module-lib-current.txt", + var moduleLibDroidstubs = droidstubsStruct{ + name: "module-lib-api-stubs-docs-non-updatable", + apiSurface: "module-lib", + apiFile: "api/module-lib-current.txt", + removedFile: "api/module-lib-removed.txt", } - var systemServerApiContribution = apiContributionStruct{ + var systemServerDroidstubs = droidstubsStruct{ // This module does not exist but is named this way for consistency - name: "system-server-api-stubs-docs-non-updatable.api.contribution", - apiSurface: "system-server", - apiFile: "api/system-server-current.txt", + name: "system-server-api-stubs-docs-non-updatable", + apiSurface: "system-server", + apiFile: "api/system-server-current.txt", + removedFile: "api/system-server-removed.txt", } - var apiContributionStructs = []apiContributionStruct{ - publicApiContribution, - systemApiContribution, - testApiContribution, - moduleLibApiContribution, - systemServerApiContribution, + var droidstubsStructs = []droidstubsStruct{ + publicDroidstubs, + systemDroidstubs, + testDroidstubs, + moduleLibDroidstubs, + systemServerDroidstubs, } - extraApiLibraryModules := map[string]apiContributionStruct{ - "android_stubs_current.from-text": publicApiContribution, - "android_system_stubs_current.from-text": systemApiContribution, - "android_test_stubs_current.from-text": testApiContribution, - "android_module_lib_stubs_current.from-text": moduleLibApiContribution, - "android_module_lib_stubs_current_full.from-text": moduleLibApiContribution, - "android_system_server_stubs_current.from-text": systemServerApiContribution, - "core.current.stubs.from-text": publicApiContribution, - "legacy.core.platform.api.stubs.from-text": publicApiContribution, - "stable.core.platform.api.stubs.from-text": publicApiContribution, - "core-lambda-stubs.from-text": publicApiContribution, - "android-non-updatable.stubs.from-text": publicApiContribution, - "android-non-updatable.stubs.system.from-text": systemApiContribution, - "android-non-updatable.stubs.test.from-text": testApiContribution, - "android-non-updatable.stubs.module_lib.from-text": moduleLibApiContribution, + extraApiLibraryModules := map[string]droidstubsStruct{ + "android_stubs_current.from-text": publicDroidstubs, + "android_system_stubs_current.from-text": systemDroidstubs, + "android_test_stubs_current.from-text": testDroidstubs, + "android_module_lib_stubs_current.from-text": moduleLibDroidstubs, + "android_module_lib_stubs_current_full.from-text": moduleLibDroidstubs, + "android_system_server_stubs_current.from-text": systemServerDroidstubs, + "core.current.stubs.from-text": publicDroidstubs, + "legacy.core.platform.api.stubs.from-text": publicDroidstubs, + "stable.core.platform.api.stubs.from-text": publicDroidstubs, + "core-lambda-stubs.from-text": publicDroidstubs, + "android-non-updatable.stubs.from-text": publicDroidstubs, + "android-non-updatable.stubs.system.from-text": systemDroidstubs, + "android-non-updatable.stubs.test.from-text": testDroidstubs, + "android-non-updatable.stubs.module_lib.from-text": moduleLibDroidstubs, } - for _, apiContribution := range apiContributionStructs { + for _, droidstubs := range droidstubsStructs { bp += fmt.Sprintf(` - java_api_contribution { + droidstubs { name: "%s", api_surface: "%s", - api_file: "%s", + check_api: { + current: { + api_file: "%s", + removed_api_file: "%s", + } + } } - `, apiContribution.name, apiContribution.apiSurface, apiContribution.apiFile) + `, + droidstubs.name, + droidstubs.apiSurface, + droidstubs.apiFile, + droidstubs.removedFile, + ) } - for libName, apiContribution := range extraApiLibraryModules { + for libName, droidstubs := range extraApiLibraryModules { bp += fmt.Sprintf(` java_api_library { name: "%s", api_contributions: ["%s"], } - `, libName, apiContribution.name) + `, libName, droidstubs.name+".api.contribution") } bp += ` @@ -552,7 +574,7 @@ func gatherRequiredDepsForTest() string { return bp } -func CheckModuleDependencies(t *testing.T, ctx *android.TestContext, name, variant string, expected []string) { +func getModuleDependencies(t *testing.T, ctx *android.TestContext, name, variant string) []string { t.Helper() module := ctx.ModuleForTests(name, variant).Module() deps := []string{} @@ -561,11 +583,29 @@ func CheckModuleDependencies(t *testing.T, ctx *android.TestContext, name, varia }) sort.Strings(deps) + return deps +} + +// CheckModuleDependencies checks if the expected dependencies of the module are +// identical to the actual dependencies. +func CheckModuleDependencies(t *testing.T, ctx *android.TestContext, name, variant string, expected []string) { + deps := getModuleDependencies(t, ctx, name, variant) + if actual := deps; !reflect.DeepEqual(expected, actual) { t.Errorf("expected %#q, found %#q", expected, actual) } } +// CheckModuleHasDependency returns true if the module depends on the expected dependency. +func CheckModuleHasDependency(t *testing.T, ctx *android.TestContext, name, variant string, expected string) bool { + for _, dep := range getModuleDependencies(t, ctx, name, variant) { + if dep == expected { + return true + } + } + return false +} + // CheckPlatformBootclasspathModules returns the apex:module pair for the modules depended upon by // the platform-bootclasspath module. func CheckPlatformBootclasspathModules(t *testing.T, result *android.TestResult, name string, expected []string) { diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 79a885fa9..2e869f447 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -575,12 +575,12 @@ type bazelShBinaryAttributes struct { } type bazelShTestAttributes struct { - Srcs bazel.LabelListAttribute - Data bazel.LabelListAttribute - Tags bazel.StringListAttribute - Test_config *string - Test_config_template *string - Auto_gen_config *bool + Srcs bazel.LabelListAttribute + Data bazel.LabelListAttribute + Data_bins bazel.LabelListAttribute + Tags bazel.StringListAttribute + Runs_on bazel.StringListAttribute + tradefed.TestConfigAttributes } func (m *ShBinary) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) { @@ -615,28 +615,42 @@ func (m *ShTest) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) { srcs := bazel.MakeLabelListAttribute( android.BazelLabelForModuleSrc(ctx, []string{*m.properties.Src})) - combinedData := append(m.testProperties.Data, m.testProperties.Data_bins...) - combinedData = append(combinedData, m.testProperties.Data_libs...) + dataBins := bazel.MakeLabelListAttribute(android.BazelLabelForModuleDeps(ctx, m.testProperties.Data_bins)) - data := bazel.MakeLabelListAttribute( - android.BazelLabelForModuleSrc(ctx, combinedData)) + var combinedData bazel.LabelList + combinedData.Append(android.BazelLabelForModuleSrc(ctx, m.testProperties.Data)) + combinedData.Append(android.BazelLabelForModuleDeps(ctx, m.testProperties.Data_bins)) + combinedData.Append(android.BazelLabelForModuleDeps(ctx, m.testProperties.Data_libs)) + data := bazel.MakeLabelListAttribute(combinedData) tags := bazel.MakeStringListAttribute( m.testProperties.Test_options.Tags) - test_config := m.testProperties.Test_config + testConfigAttributes := tradefed.GetTestConfigAttributes( + ctx, + m.testProperties.Test_config, + []string{}, + m.testProperties.Auto_gen_config, + m.testProperties.Test_suites, + m.testProperties.Test_config_template, + nil, + nil, + ) - test_config_template := m.testProperties.Test_config_template + unitTest := m.testProperties.Test_options.Unit_test - auto_gen_config := m.testProperties.Auto_gen_config + runs_on := bazel.MakeStringListAttribute(android.RunsOn( + m.ModuleBase.HostSupported(), + m.ModuleBase.DeviceSupported(), + (unitTest != nil && *unitTest))) attrs := &bazelShTestAttributes{ Srcs: srcs, Data: data, + Data_bins: dataBins, Tags: tags, - Test_config: test_config, - Test_config_template: test_config_template, - Auto_gen_config: auto_gen_config, + Runs_on: runs_on, + TestConfigAttributes: testConfigAttributes, } props := bazel.BazelTargetModuleProperties{ diff --git a/tests/b_args_test.sh b/tests/b_args_test.sh new file mode 100755 index 000000000..0dfbabf6d --- /dev/null +++ b/tests/b_args_test.sh @@ -0,0 +1,43 @@ +#!/bin/bash -eu + +# This file tests the creation of bazel commands for b usage +set -o pipefail +source "$(dirname "$0")/../../bazel/lib.sh" + +BES_UUID="blank" +OUT_DIR="arbitrary_out" +b_args=$(formulate_b_args "build --config=nonsense foo:bar") + +if [[ $b_args != "build --profile=$OUT_DIR/bazel_metrics-profile --config=bp2build --invocation_id=$BES_UUID --config=metrics_data --config=nonsense foo:bar" ]]; then + echo "b args are malformed" + echo "Expected : build --profile=$OUT_DIR/bazel_metrics-profile --config=bp2build --invocation_id=$BES_UUID --config=metrics_data --config=nonsense foo:bar" + echo "Actual: $b_args" + exit 1 +fi + +b_args=$(formulate_b_args "build --config=nonsense --disable_bes --package_path \"my package\" foo:bar") + +if [[ $b_args != "build --profile=$OUT_DIR/bazel_metrics-profile --config=bp2build --invocation_id=$BES_UUID --config=nonsense --package_path \"my package\" foo:bar" ]]; then + echo "b args are malformed" + echo "Expected : build --profile=$OUT_DIR/bazel_metrics-profile --config=bp2build --invocation_id=$BES_UUID --config=nonsense --package_path \"my package\" foo:bar" + echo "Actual: $b_args" + exit 1 +fi + +# Test with startup option +b_args=$(formulate_b_args "--batch build --config=nonsense --disable_bes --package_path \"my package\" foo:bar") +if [[ $b_args != "--batch build --profile=$OUT_DIR/bazel_metrics-profile --config=bp2build --invocation_id=$BES_UUID --config=nonsense --package_path \"my package\" foo:bar" ]]; then + echo "b args are malformed" + echo "Expected : --batch build --profile=$OUT_DIR/bazel_metrics-profile --config=bp2build --invocation_id=$BES_UUID --config=nonsense --package_path \"my package\" foo:bar" + echo "Actual: $b_args" + exit 1 +fi + +OUT_DIR="mock_out" +TEST_PROFILE_OUT=$(get_profile_out_dir) +if [[ $TEST_PROFILE_OUT != "mock_out" ]]; then + echo "Profile Out is malformed." + echo "Expected: mock_out" + echo "Actual: $TEST_PROFILE_OUT" + exit 1 +fi diff --git a/tests/lib.sh b/tests/lib.sh index fb3b374d9..e0b319e11 100644 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -16,7 +16,7 @@ function make_mock_top { if [[ -n "$HARDWIRED_MOCK_TOP" ]]; then MOCK_TOP="$HARDWIRED_MOCK_TOP" else - MOCK_TOP=$(mktemp -t -d st.XXXXX) + MOCK_TOP=$(make_mock_top) trap cleanup_mock_top EXIT fi diff --git a/tests/run_integration_tests.sh b/tests/run_integration_tests.sh index 8045591b4..231e18b62 100755 --- a/tests/run_integration_tests.sh +++ b/tests/run_integration_tests.sh @@ -4,6 +4,7 @@ set -o pipefail TOP="$(readlink -f "$(dirname "$0")"/../../..)" "$TOP/build/soong/tests/androidmk_test.sh" +"$TOP/build/soong/tests/b_args_test.sh" "$TOP/build/soong/tests/bootstrap_test.sh" "$TOP/build/soong/tests/mixed_mode_test.sh" "$TOP/build/soong/tests/bp2build_bazel_test.sh" diff --git a/ui/build/config.go b/ui/build/config.go index f80868c33..2e5921a2c 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -1349,6 +1349,19 @@ func (c *configImpl) rbeProxyLogsDir() string { return v } } + return c.rbeTmpDir() +} + +func (c *configImpl) rbeDownloadTmpDir() string { + for _, f := range []string{"RBE_download_tmp_dir", "FLAG_download_tmp_dir"} { + if v, ok := c.environ.Get(f); ok { + return v + } + } + return c.rbeTmpDir() +} + +func (c *configImpl) rbeTmpDir() string { buildTmpDir := shared.TempDirForOutDir(c.SoongOutDir()) return filepath.Join(buildTmpDir, "rbe") } diff --git a/ui/build/rbe.go b/ui/build/rbe.go index 3b9d301f5..19a54dfc2 100644 --- a/ui/build/rbe.go +++ b/ui/build/rbe.go @@ -55,13 +55,14 @@ func rbeCommand(ctx Context, config Config, rbeCmd string) string { func getRBEVars(ctx Context, config Config) map[string]string { vars := map[string]string{ - "RBE_log_dir": config.rbeProxyLogsDir(), - "RBE_re_proxy": config.rbeReproxy(), - "RBE_exec_root": config.rbeExecRoot(), - "RBE_output_dir": config.rbeProxyLogsDir(), - "RBE_proxy_log_dir": config.rbeProxyLogsDir(), - "RBE_cache_dir": config.rbeCacheDir(), - "RBE_platform": "container-image=" + remoteexec.DefaultImage, + "RBE_log_dir": config.rbeProxyLogsDir(), + "RBE_re_proxy": config.rbeReproxy(), + "RBE_exec_root": config.rbeExecRoot(), + "RBE_output_dir": config.rbeProxyLogsDir(), + "RBE_proxy_log_dir": config.rbeProxyLogsDir(), + "RBE_cache_dir": config.rbeCacheDir(), + "RBE_download_tmp_dir": config.rbeDownloadTmpDir(), + "RBE_platform": "container-image=" + remoteexec.DefaultImage, } if config.StartRBE() { name, err := config.rbeSockAddr(absPath(ctx, config.TempDir())) diff --git a/xml/xml_conversion_test.go b/xml/xml_conversion_test.go index 6606ddca6..c052b44f2 100644 --- a/xml/xml_conversion_test.go +++ b/xml/xml_conversion_test.go @@ -121,8 +121,8 @@ prebuilt_etc_xml { "filename_from_src": `True`, "dir": `"etc"`, "src": `select({ - "//build/bazel/platforms/arch:arm": "barSrc", - "//build/bazel/platforms/arch:arm64": "bazSrc", + "//build/bazel_common_rules/platforms/arch:arm": "barSrc", + "//build/bazel_common_rules/platforms/arch:arm64": "bazSrc", "//conditions:default": None, })`, })}}) |