openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Update NDK libc++ header paths." am: 66dcc50 

am: 5514b26

* commit '5514b26d26e759e12557efbf10fe69acfbf5114c':
  Update NDK libc++ header paths.

Change-Id: I9153be2e981b4bda778a9ea74cc867435c68c6d9
This commit is contained in:
Dan Albert 2016-04-04 20:38:11 +00:00 committed by android-build-merger
parent 75b2801963 5514b26d26
commit fd953aec6e
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/binary.mk
View File

@ -135,9 +135,20 @@ ifdef LOCAL_SDK_VERSION
endif
else # LOCAL_NDK_STL_VARIANT is not stlport_* either
ifneq (,$(filter c++_%, $(LOCAL_NDK_STL_VARIANT)))
my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/llvm-libc++/libcxx/include \
$(my_ndk_source_root)/cxx-stl/llvm-libc++/gabi++/include \
$(my_ndk_source_root)/android/support/include
my_ndk_stl_include_path := \
$(my_ndk_source_root)/cxx-stl/llvm-libc++/libcxx/include \
$(my_ndk_source_root)/android/support/include \
# Pre-r11 NDKs used libgabi++ for libc++'s C++ ABI, but r11 and later use
# libc++abi.
ifeq ($(LOCAL_NDK_VERSION),r10)
my_ndk_stl_include_path += \
$(my_ndk_source_root)/cxx-stl/llvm-libc++/gabi++/include
else
my_ndk_stl_include_path += \
$(my_ndk_source_root)/cxx-stl/llvm-libc++abi/libcxxabi/include
endif
ifeq (c++_static,$(LOCAL_NDK_STL_VARIANT))
my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/llvm-libc++/libs/$(my_cpu_variant)/libc++_static.a
my_ldlibs += -ldl