From 658d1e04342bcce9c0173437b84b84502c34d830 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 22 Mar 2016 17:17:40 -0700 Subject: [PATCH] Update NDK libc++ header paths. The r11 libc++ uses libc++abi instead of libgabi++. Bug: http://b/27801981 Change-Id: I5b90c14125dc024b2b290897bb3ef1c8d9546a7b --- core/binary.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index 6d4952170..280e0ba32 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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