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

Merge "Escape cc ldflags in bp2build conversion" am: 9deb87e8e2 am: e2f1b14961

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

Change-Id: I8e48f7da545c1ad61dde8e80dbb49cc94923488d
This commit is contained in:
Treehugger Robot
2022-02-09 23:41:19 +00:00
committed by Automerger Merge Worker
parent 5f83a7f3bc e2f1b14961
commit 04bf233677
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bp2build/cc_library_conversion_test.go
View File

@@ -2437,3 +2437,18 @@ cc_library {
}, },
) )
} }
func TestCcLibraryEscapeLdflags(t *testing.T) {
runCcLibraryTestCase(t, bp2buildTestCase{
moduleTypeUnderTest: "cc_library",
moduleTypeUnderTestFactory: cc.LibraryFactory,
blueprint: soongCcProtoPreamble + `cc_library {
name: "foo",
ldflags: ["-Wl,--rpath,${ORIGIN}"],
include_build_directory: false,
}`,
expectedBazelTargets: makeCcLibraryTargets("foo", attrNameToString{
"linkopts": `["-Wl,--rpath,$${ORIGIN}"]`,
}),
})
}

2
cc/bp2build.go
View File

@@ -644,7 +644,7 @@ func (la *linkerAttributes) bp2buildForAxisAndConfig(ctx android.BazelConversion
var linkerFlags []string var linkerFlags []string
if len(props.Ldflags) > 0 { if len(props.Ldflags) > 0 {
linkerFlags = append(linkerFlags, props.Ldflags...) linkerFlags = append(linkerFlags, proptools.NinjaEscapeList(props.Ldflags)...)
// binaries remove static flag if -shared is in the linker flags // binaries remove static flag if -shared is in the linker flags
if isBinary && android.InList("-shared", linkerFlags) { if isBinary && android.InList("-shared", linkerFlags) {
axisFeatures = append(axisFeatures, "-static_flag") axisFeatures = append(axisFeatures, "-static_flag")