| commit | 5951d3e2bba6c6a5e26728f51942c17954bacb2c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Jan 28 00:05:06 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Jan 28 00:05:07 2017 +0000 |
| tree | 7ac58e459f8d645bfbf4139b39c814397125561e | |
| parent | dc2597d25a453cd26b99754efedc1101f114b2b8 [diff] | |
| parent | 62ea583316d1ff1b167165762012c7faaf5d086a [diff] |
Merge "Fixed androidmk crash when parsing external/aac/Android.mk"
diff --git a/cc/binary.go b/cc/binary.go index 78883fa..d6a72a2 100644 --- a/cc/binary.go +++ b/cc/binary.go
@@ -131,7 +131,7 @@ } 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