We don't actually need all of libc++ here.
All we're actually interested in is the unwinder. Since that's now a separate library, just use that. Change-Id: If86071a0d850da961336a58147b70369ace7bd12
This commit is contained in:
parent
083769a3df
commit
a7c2e0bad6
@ -1161,14 +1161,11 @@ LOCAL_CLANG := $(use_clang)
|
|||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := libc libdl
|
LOCAL_SHARED_LIBRARIES := libc libdl
|
||||||
ifeq ($(TARGET_ARCH),arm)
|
LOCAL_CXX_STL := none
|
||||||
|
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_CXX_STL := libc++_static
|
LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm
|
||||||
else
|
|
||||||
LOCAL_CXX_STL := none
|
|
||||||
endif
|
|
||||||
LOCAL_SYSTEM_SHARED_LIBRARIES :=
|
|
||||||
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
|
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
|
||||||
|
|
||||||
# Don't install on release build
|
# Don't install on release build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user