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 am: 04bf233677 am: ef3b27ec23

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

Change-Id: Ia6d24953475454388ff4dbc5fe194c1f2608332b
This commit is contained in:
Treehugger Robot
2022-02-10 00:15:44 +00:00
committed by Automerger Merge Worker
parent 64db9c71c9 ef3b27ec23
commit a3cb9b7fe6
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/bp2build.go
View File

@@ -644,7 +644,7 @@ func (la *linkerAttributes) bp2buildForAxisAndConfig(ctx android.BazelConversion
var linkerFlags []string
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
if isBinary && android.InList("-shared", linkerFlags) {
axisFeatures = append(axisFeatures, "-static_flag")