| commit | 46c7bc83ab0324983312f16bd40cc1cdfe11cce6 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Aug 27 22:20:51 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Aug 27 22:20:51 2015 +0000 |
| tree | 80e900ba5dbe10d065e0d89334798622bec32fb0 | |
| parent | bfaee4bd6ad901a699df21fd44d95f34e2e7444d [diff] | |
| parent | cc6461861e6f09e0e0dd98e9409a11ea2c356d88 [diff] |
Merge "Don't re-export libunwind_llvm."
diff --git a/libc/Android.mk b/libc/Android.mk index 437f8b2..d6b208c 100644 --- a/libc/Android.mk +++ b/libc/Android.mk
@@ -1446,6 +1446,7 @@ # Only need this for arm since libc++ uses its own unwind code that # doesn't mix with the other default unwind code. LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm +LOCAL_LDFLAGS_arm := -Wl,--exclude-libs,libunwind_llvm.a LOCAL_STATIC_LIBRARIES += libc++abi LOCAL_ALLOW_UNDEFINED_SYMBOLS := true