Bug 1283611 - Add support for NDK r13's libc++ paths. r?froydnj
The inner directory in these projects was removed in r13.
MozReview-Commit-ID: AxWgxXyOKJ4
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -96,16 +96,32 @@ if test "$OS_TARGET" = "Android"; then
cxx_include="$cxx_base/libcxx/include"
cxxabi_base="$ndk_base/llvm-libc++abi"
cxxabi_include="$cxxabi_base/libcxxabi/include"
if ! test -e "$cxx_libs/libc++_static.a"; then
AC_MSG_ERROR([Couldn't find path to llvm-libc++ in the android ndk])
fi
+ if ! test -e "$cxx_include"; then
+ # NDK r13 removes the inner "libcxx" directory.
+ cxx_include="$cxx_base/include"
+ if ! test -e "$cxx_include"; then
+ AC_MSG_ERROR([Couldn't find path to libc++ includes in the android ndk])
+ fi
+ fi
+
+ if ! test -e "$cxxabi_include"; then
+ # NDK r13 removes the inner "libcxxabi" directory.
+ cxxabi_include="$cxxabi_base/include"
+ if ! test -e "$cxxabi_include"; then
+ AC_MSG_ERROR([Couldn't find path to libc++abi includes in the android ndk])
+ fi
+ fi
+
STLPORT_LIBS="-L$cxx_libs -lc++_static"
# NDK r12 split the libc++ runtime libraries into pieces.
for lib in c++abi unwind android_support; do
if test -e "$cxx_libs/lib${lib}.a"; then
STLPORT_LIBS="$STLPORT_LIBS -l${lib}"
fi
done
# Add android/support/include/ for prototyping long double math