merge mozilla-central to mozilla-inbound. r=merge a=merge
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sun, 17 Sep 2017 11:41:03 +0200
changeset 381370 1edc0d159982f6befa8c6e38f8af7e1f39c73e92
parent 381369 0d5b3f16219c3780c33c1804613a00b77263f7b8 (current diff)
parent 381355 faa897d7948b7e2439573f39c34366c138913663 (diff)
child 381371 c4f1d0d1852b6e61c7a3e78ec8c0e33879c20d95
push id32526
push userarchaeopteryx@coole-files.de
push dateSun, 17 Sep 2017 21:32:35 +0000
treeherdermozilla-central@ae39864562c6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge, merge
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge mozilla-central to mozilla-inbound. r=merge a=merge
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -58,44 +58,48 @@ if test "$OS_TARGET" = "Android"; then
     AC_SUBST(ANDROID_CPU_ARCH)
 fi
 ])
 
 AC_DEFUN([MOZ_ANDROID_STLPORT],
 [
 
 if test "$OS_TARGET" = "Android"; then
-    cpu_arch_dir="$ANDROID_CPU_ARCH"
-    # NDK r12 removed the arm/thumb library split and just made everything
-    # thumb by default.  Attempt to compensate.
-    if test "$MOZ_THUMB2" = 1 -a -d "$cpu_arch_dir/thumb"; then
-        cpu_arch_dir="$cpu_arch_dir/thumb"
-    fi
-
     if test -z "$STLPORT_CPPFLAGS$STLPORT_LIBS"; then
         case "$android_cxx_stl" in
         libstdc++)
             # android-ndk-r8b and later
             ndk_base="$android_ndk/sources/cxx-stl/gnu-libstdc++/$android_gnu_compiler_version"
             ndk_libs_include="$ndk_base/libs/$ANDROID_CPU_ARCH"
-            ndk_libs="$ndk_base/libs/$cpu_arch_dir"
+            # NDK r12 removed the arm/thumb library split and just made
+            # everything thumb by default.  Attempt to compensate.
+            if test "$MOZ_THUMB2" = 1 -a -d "$ndk_libs_include/thumb"; then
+                ndk_libs="$ndk_libs_include/thumb"
+            else
+                ndk_libs="$ndk_libs_include"
+            fi
             ndk_include="$ndk_base/include"
 
             if ! test -e "$ndk_libs/libgnustl_static.a"; then
                 AC_MSG_ERROR([Couldn't find path to gnu-libstdc++ in the android ndk])
             fi
 
             STLPORT_LIBS="-L$ndk_libs -lgnustl_static"
             STLPORT_CPPFLAGS="-I$ndk_include -I$ndk_include/backward -I$ndk_libs_include/include"
             ;;
         libc++)
             # android-ndk-r8b and later
             ndk_base="$android_ndk/sources/cxx-stl"
             cxx_base="$ndk_base/llvm-libc++"
-            cxx_libs="$cxx_base/libs/$cpu_arch_dir"
+            cxx_libs="$cxx_base/libs/$ANDROID_CPU_ARCH"
+            # NDK r12 removed the arm/thumb library split and just made
+            # everything thumb by default.  Attempt to compensate.
+            if test "$MOZ_THUMB2" = 1 -a -d "$cxx_libs/thumb"; then
+                cxx_libs="$cxx_libs/thumb"
+            fi
             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