generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use the default unwind code."

Browse Source
This commit is contained in:
Christopher Ferris
2014-08-27 21:21:28 +00:00
committed by Gerrit Code Review
parent cb322a1168 b78e60e7b7
commit 6ecd1cd195
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libc/Android.mk
View File

@@ -1089,7 +1089,6 @@ LOCAL_CPPFLAGS := $(libc_common_cppflags)
# Make sure that unwind.h comes from libunwind. # Make sure that unwind.h comes from libunwind.
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
external/libunwind/include \
$(libc_common_c_includes) \ $(libc_common_c_includes) \
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@@ -1105,7 +1104,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
LOCAL_SHARED_LIBRARIES := libc libdl LOCAL_SHARED_LIBRARIES := libc libdl
LOCAL_SYSTEM_SHARED_LIBRARIES := LOCAL_SYSTEM_SHARED_LIBRARIES :=
LOCAL_WHOLE_STATIC_LIBRARIES := libunwindbacktrace # 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 := libc++
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
# Don't install on release build # Don't install on release build