Adding upstream version 110.0.1.upstream/110.0.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 57 insertions, 0 deletions

diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
new file mode 100644
index 0000000000..d4967864d8
--- /dev/null
+++ b/build/autoconf/android.m4
@@ -0,0 +1,57 @@
+dnl This Source Code Form is subject to the terms of the Mozilla Public
+dnl License, v. 2.0. If a copy of the MPL was not distributed with this
+dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+AC_DEFUN([MOZ_ANDROID_NDK],
+[
+
+case "$target" in
+*-android*|*-linuxandroid*)
+    dnl $android_* will be set for us by Python configure.
+    directory_include_args="-isystem $android_system -isystem $android_sysroot/usr/include"
+
+    # clang will do any number of interesting things with host tools unless we tell
+    # it to use the NDK tools.
+    extra_opts="--gcc-toolchain=$(dirname $(dirname $TOOLCHAIN_PREFIX))"
+    CPPFLAGS="$extra_opts -D__ANDROID_API__=$android_version $CPPFLAGS"
+    ASFLAGS="$extra_opts $ASFLAGS"
+    LDFLAGS="$extra_opts $LDFLAGS"
+
+    CPPFLAGS="$directory_include_args $CPPFLAGS"
+    CFLAGS="-fno-short-enums -fno-exceptions $CFLAGS"
+    CXXFLAGS="-fno-short-enums -fno-exceptions $CXXFLAGS $stlport_cppflags"
+    ASFLAGS="$directory_include_args -DANDROID $ASFLAGS"
+    ;;
+esac
+
+])
+
+AC_DEFUN([MOZ_ANDROID_STLPORT],
+[
+
+if test "$OS_TARGET" = "Android"; then
+    if test -z "$STLPORT_LIBS"; then
+        # android-ndk-r8b and later
+        cxx_libs="$android_ndk/sources/cxx-stl/llvm-libc++/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
+
+        if ! test -e "$cxx_libs/libc++_static.a"; then
+            AC_MSG_ERROR([Couldn't find path to llvm-libc++ in the android ndk])
+        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
+    fi
+fi
+AC_SUBST_LIST([STLPORT_LIBS])
+
+])