am a71f81a0: am 46c7bc83: Merge "Don\'t re-export libunwind_llvm."

* commit 'a71f81a08b6a94ef79c96b62733bb97de5350d79':
  Don't re-export libunwind_llvm.
This commit is contained in:
Dan Albert 2015-08-27 22:37:01 +00:00 committed by Android Git Automerger
commit 5e98eaee2d

View File

@ -1446,6 +1446,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES :=
# 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