commit 66dcc50c71cd6bc198e8e411ea902405bc48fabe
author Dan Albert <danalbert@google.com> Mon Apr 04 20:27:42 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 04 20:27:42 2016 +0000
tree 6b7d3747ec52dd6eb6807d3bdc39c89755ed67b5
parent ce3086971357779878ccf1f45e77e5ada82f8a59
parent 658d1e04342bcce9c0173437b84b84502c34d830

Merge "Update NDK libc++ header paths."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 6d49521..280e0ba 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -135,9 +135,20 @@
     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