Merge "Don't re-export libunwind_llvm."
This commit is contained in:
commit
46c7bc83ab
@ -1446,6 +1446,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES :=
|
|||||||
# Only need this for arm since libc++ uses its own unwind code that
|
# Only need this for arm since libc++ uses its own unwind code that
|
||||||
# doesn't mix with the other default unwind code.
|
# doesn't mix with the other default unwind code.
|
||||||
LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm
|
LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm
|
||||||
|
LOCAL_LDFLAGS_arm := -Wl,--exclude-libs,libunwind_llvm.a
|
||||||
LOCAL_STATIC_LIBRARIES += libc++abi
|
LOCAL_STATIC_LIBRARIES += libc++abi
|
||||||
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
|
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user