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

am 71cbcdcf: Merge "We don\'t actually need all of libc++ here."

Browse Source 
* commit '71cbcdcf947835076241b9dd72099f28997eb290':
  We don't actually need all of libc++ here.
This commit is contained in:
Dan Albert
2014-10-15 20:10:08 +00:00
committed by Android Git Automerger
parent a7995f31e2 71cbcdcf94
commit 21df799218
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libc/Android.mk
View File

@@ -1162,14 +1162,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