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

Commit 6cd88c3b authored Jan 30, 2023 by Treehugger Robot Committed by Automerger Merge Worker Jan 30, 2023

Merge "convert cc_object crt property in bp2build" am: 32c52ad6 am: d4cb07e3

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2402223

Change-Id: I7117a9d54b674a007aa96c423446256831ef57fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 321cc083 d4cb07e3

bp2build/cc_object_conversion_test.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ func TestCcObjectSimple(t *testing.T) {
		exclude_srcs: ["a/b/exclude.c"],
		sdk_version: "current",
		min_sdk_version: "29",
		crt: true,
		}
		`,
		ExpectedBazelTargets: []string{
		@@ -76,6 +77,7 @@ func TestCcObjectSimple(t *testing.T) {
		"system_dynamic_deps": `[]`,
		"sdk_version": `"current"`,
		"min_sdk_version": `"29"`,
		"crt": "True",
		}),
		},
		})

cc/object.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,7 @@ type bazelObjectAttributes struct {
		Absolute_includes bazel.StringListAttribute
		Stl *string
		Linker_script bazel.LabelAttribute
		Crt *bool
		sdkAttributes
		}

		@@ -208,6 +209,7 @@ func objectBp2Build(ctx android.TopDownMutatorContext, m *Module) {
		Absolute_includes: compilerAttrs.absoluteIncludes,
		Stl: compilerAttrs.stl,
		Linker_script: linkerScript,
		Crt: m.linker.(*objectLinker).Properties.Crt,
		sdkAttributes: bp2BuildParseSdkAttributes(m),
		}