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

Use LOCAL_CXX_STL to select libc++_static.

Browse Source 
Directly adding the library to LOCAL_STATIC_LIBRARIES thwarts a few
build system checks.

Change-Id: Ib23c43badfa85de21c691f79ccdcc2cbe2a89b33
This commit is contained in:
Dan Albert 2014-10-13 11:20:29 -07:00
parent 4c0862474e
commit 90a29db0f4
1 changed files with 6 additions and 3 deletions
Show Stats 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_SHARED_LIBRARIES := libc libdl
LOCAL_CXX_STL := none
LOCAL_SYSTEM_SHARED_LIBRARIES :=
ifeq ($(TARGET_ARCH),arm)
# 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++_static
LOCAL_CXX_STL := libc++_static
else
LOCAL_CXX_STL := none
endif
LOCAL_SYSTEM_SHARED_LIBRARIES :=
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
# Don't install on release build