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

am 94571f9a: Merge "Use LOCAL_CXX_STL to select libc++_static."

Browse Source 
* commit '94571f9ade03cfe24bff1bddc4d6c1a320b39b8e':
  Use LOCAL_CXX_STL to select libc++_static.
This commit is contained in:
Dan Albert
2014-10-13 22:15:54 +00:00
committed by Android Git Automerger
parent 93e474ef54 94571f9ade
commit a6ef2e2819
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libc/Android.mk
View File

@@ -1161,11 +1161,14 @@ 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
LOCAL_CXX_STL := none ifeq ($(TARGET_ARCH),arm)
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 := libc++_static LOCAL_CXX_STL := libc++_static
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