tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Put shared library ldflags first"

Browse source
This commit is contained in:
Treehugger Robot 2016-07-14 04:26:29 +00:00 committed by Gerrit Code Review
commit feba062cd5
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cc/cc.go
View file

@ -1491,7 +1491,7 @@ type flagExporter struct {
func (f *flagExporter) exportIncludes(ctx ModuleContext, inc string) {
includeDirs := android.PathsForModuleSrc(ctx, f.Properties.Export_include_dirs)
for _, dir := range includeDirs.Strings() {
f.flags = append(f.flags, inc + dir)
f.flags = append(f.flags, inc+dir)
}
}
@ -1613,26 +1613,28 @@ func (library *libraryLinker) flags(ctx ModuleContext, flags Flags) Flags {
if flags.Clang || ctx.Host() {
sharedFlag = "-shared"
}
var f []string
if ctx.Device() {
flags.LdFlags = append(flags.LdFlags,
f = append(f,
"-nostdlib",
"-Wl,--gc-sections",
)
}
if ctx.Darwin() {
flags.LdFlags = append(flags.LdFlags,
f = append(f,
"-dynamiclib",
"-single_module",
//"-read_only_relocs suppress",
"-install_name @rpath/"+libName+flags.Toolchain.ShlibSuffix(),
)
} else {
flags.LdFlags = append(flags.LdFlags,
f = append(f,
sharedFlag,
"-Wl,-soname,"+libName+flags.Toolchain.ShlibSuffix(),
)
"-Wl,-soname,"+libName+flags.Toolchain.ShlibSuffix())
}
flags.LdFlags = append(f, flags.LdFlags...)
}
return flags