Merge "Update NDK libc++ header paths."

    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