Don't force libraries upon static executables.

am: dc2597d25a

Change-Id: If74fae103ddcd5e4add17da6dd20ad22bf06279f
This commit is contained in:
Dan Albert
2017-01-27 23:01:14 +00:00
committed by android-build-merger

View File

@@ -131,7 +131,7 @@ func (binary *binaryDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps {
}
if binary.static() {
if inList("libc++_static", deps.StaticLibs) {
if ctx.selectedStl() == "libc++_static" {
deps.StaticLibs = append(deps.StaticLibs, "libm", "libc", "libdl")
}
// static libraries libcompiler_rt, libc and libc_nomalloc need to be linked with