Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f0c2ac5 authored May 15, 2023 by Trevor Radcliffe

Change bp2build to reflect arm_isa refactor

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

parent abc2b2ad

bp2build/cc_binary_conversion_test.go

+1 −4

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

bp2build/cc_library_conversion_test.go

+1 −4

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

cc/bp2build.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -492,7 +492,7 @@ func (ca *compilerAttributes) bp2buildForAxisAndConfig(ctx android.BazelConversi

		instructionSet := proptools.StringDefault(props.Instruction_set, "")
		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" {
		ctx.ModuleErrorf("Unknown value for instruction_set: %s", instructionSet)
		}