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

Revert \"Revert \"Switch libcompiler_rt-extras to LateStaticLibs.\"\"

Browse Source 
am: 1034786c37

Change-Id: I14b765d0cc76748f2a30925170da53d49ba7d2f4
This commit is contained in:
Stephen Hines
2016-07-19 00:07:52 +00:00
committed by android-build-merger
parent e79be1b210 1034786c37
commit 7ff2f08a45
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/builder.go
View File

@@ -369,11 +369,11 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext,
libFlagsList = append(libFlagsList, staticLibs.Strings()...) libFlagsList = append(libFlagsList, staticLibs.Strings()...)
if groupLate && len(lateStaticLibs) > 0 { if groupLate && !ctx.Darwin() && len(lateStaticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--start-group") libFlagsList = append(libFlagsList, "-Wl,--start-group")
} }
libFlagsList = append(libFlagsList, lateStaticLibs.Strings()...) libFlagsList = append(libFlagsList, lateStaticLibs.Strings()...)
if groupLate && len(lateStaticLibs) > 0 { if groupLate && !ctx.Darwin() && len(lateStaticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--end-group") libFlagsList = append(libFlagsList, "-Wl,--end-group")
} }

2
cc/cc.go
View File

@@ -1337,7 +1337,7 @@ func (linker *baseLinker) deps(ctx BaseModuleContext, deps Deps) Deps {
deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...) deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...)
if !ctx.sdk() && ctx.ModuleName() != "libcompiler_rt-extras" { if !ctx.sdk() && ctx.ModuleName() != "libcompiler_rt-extras" {
deps.StaticLibs = append(deps.StaticLibs, "libcompiler_rt-extras") deps.LateStaticLibs = append(deps.LateStaticLibs, "libcompiler_rt-extras")
} }
if ctx.Device() { if ctx.Device() {