From 515c0bfac407270a38f32159c121633b9c07edc0 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <tdz@users.sourceforge.net>
Date: Wed, 15 Jun 2016 10:59:48 +0100
Subject: [PATCH] Bug 1276927: Remove Gonk from JS builds where possible,
 r=dvander

B2G/Gonk is just a special case of Android builds. Removing Gonk
code from JS builds simplifies the build process and maintenance.

MozReview-Commit-ID: 6mxm2Hqmx0c
---
 js/src/jscntxt.cpp      |  2 +-
 js/src/old-configure.in | 23 ++---------------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index ad996d120d6a..2d6dc66385e1 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -982,7 +982,7 @@ JSContext::currentlyRunning() const
 static bool
 ComputeIsJITBroken()
 {
-#if !defined(ANDROID) || defined(GONK)
+#if !defined(ANDROID)
     return false;
 #else  // ANDROID
     if (getenv("JS_IGNORE_JIT_BROKENNESS")) {
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 6084285ff607..581cd7c0a96c 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -82,29 +82,10 @@ else
 fi
 AC_SUBST(autoconfmk)
 
+MOZ_ANDROID_NDK
+
 if test -n "$gonkdir" ; then
-    kernel_name=`uname -s | tr "[[:upper:]]" "[[:lower:]]"`
-    dnl Default to ICS
-    ANDROID_VERSION=15
-    if test -n "${PLATFORM_SDK_VERSION}"; then
-        ANDROID_VERSION="${PLATFORM_SDK_VERSION}"
-    fi
-
-    STLPORT_CPPFLAGS="-I$_topsrcdir/build/stlport/stlport -I$gonkdir/ndk/sources/cxx-stl/system/include"
-    STLPORT_LIBS="-lstlport"
-
-    CPPFLAGS="-DANDROID $TARGET_C_INCLUDES -I$gonkdir/frameworks/base/native/include -I$gonkdir/system/core/include -isystem $gonkdir/bionic $CPPFLAGS -I$gonkdir/external/valgrind/fxos-include"
-    CFLAGS="-fno-short-enums -fno-exceptions $CFLAGS"
-    CXXFLAGS="-fno-short-enums -fno-exceptions $CXXFLAGS $STLPORT_CPPFLAGS"
-    LIBS="$LIBS $STLPORT_LIBS"
-
-    dnl Add -llog by default, since we use it all over the place.
     LDFLAGS="-L$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib -Wl,-rpath-link=$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib --sysroot=$gonkdir/out/target/product/$GONK_PRODUCT/obj/ -llog $LDFLAGS"
-
-    AC_DEFINE(ANDROID)
-    AC_DEFINE(GONK)
-else
-    MOZ_ANDROID_NDK
 fi
 
 case "$target" in