StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change bp2build to reflect arm_isa refactor

Browse Source 
We now rely on a `with_features` clause to effectively disable
thumb when `arm_isa_arm` is enabled. Thus, we no longer need to
add `-arm_isa_thumb` in bp2build.

Bug: 261733820
Test: Unit tests
Change-Id: I9da85834855b297a75097ce3a11e101f55bd53f4
This commit is contained in:
Trevor Radcliffe
2023-05-15 18:00:59 +00:00
parent abc2b2adb3
commit 5f0c2ac535
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bp2build/cc_binary_conversion_test.go
View File

@@ -644,10 +644,7 @@ func TestCcBinaryWithInstructionSet(t *testing.T) {
targets: []testBazelTarget{ targets: []testBazelTarget{
{"cc_binary", "foo", AttrNameToString{ {"cc_binary", "foo", AttrNameToString{
"features": `select({ "features": `select({
"//build/bazel/platforms/arch:arm": [ "//build/bazel/platforms/arch:arm": ["arm_isa_arm"],
"arm_isa_arm",
"-arm_isa_thumb",
],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
"local_includes": `["."]`, "local_includes": `["."]`,

5
bp2build/cc_library_conversion_test.go
View File

@@ -3219,10 +3219,7 @@ func TestCcLibraryWithInstructionSet(t *testing.T) {
`, `,
ExpectedBazelTargets: makeCcLibraryTargets("foo", AttrNameToString{ ExpectedBazelTargets: makeCcLibraryTargets("foo", AttrNameToString{
"features": `select({ "features": `select({
"//build/bazel/platforms/arch:arm": [ "//build/bazel/platforms/arch:arm": ["arm_isa_arm"],
"arm_isa_arm",
"-arm_isa_thumb",
],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
"local_includes": `["."]`, "local_includes": `["."]`,

2
cc/bp2build.go
View File

@@ -492,7 +492,7 @@ func (ca *compilerAttributes) bp2buildForAxisAndConfig(ctx android.BazelConversi
instructionSet := proptools.StringDefault(props.Instruction_set, "") instructionSet := proptools.StringDefault(props.Instruction_set, "")
if instructionSet == "arm" { if instructionSet == "arm" {
ca.features.SetSelectValue(axis, config, []string{"arm_isa_arm", "-arm_isa_thumb"}) ca.features.SetSelectValue(axis, config, []string{"arm_isa_arm"})
} else if instructionSet != "" && instructionSet != "thumb" { } else if instructionSet != "" && instructionSet != "thumb" {
ctx.ModuleErrorf("Unknown value for instruction_set: %s", instructionSet) ctx.ModuleErrorf("Unknown value for instruction_set: %s", instructionSet)
} }