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

Merge "Deprecate group_static_libs property"

Browse Source
This commit is contained in:
Treehugger Robot
2021-08-31 16:35:18 +00:00
committed by Gerrit Code Review
parent b7e5985fd5 5569d6eb47
commit add0b0880e
4 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/builder.go
View File

@@ -384,9 +384,6 @@ type builderFlags struct {
systemIncludeFlags string
// True if static libraries should be grouped (using `-Wl,--start-group` and `-Wl,--end-group`).
groupStaticLibs bool
proto android.ProtoFlags
protoC bool // If true, compile protos as `.c` files. Otherwise, output as `.cc`.
protoOptionsFile bool // If true, output a proto options file.
@@ -752,13 +749,7 @@ func transformObjToDynamicBinary(ctx android.ModuleContext,
}
}
if flags.groupStaticLibs && !ctx.Darwin() && len(staticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--start-group")
}
libFlagsList = append(libFlagsList, staticLibs.Strings()...)
if flags.groupStaticLibs && !ctx.Darwin() && len(staticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--end-group")
}
if groupLate && !ctx.Darwin() && len(lateStaticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--start-group")