Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1276927: Remove Gonk from JS builds where possible, r=dvander

Browse Source 
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
This commit is contained in:
Thomas Zimmermann 2016-06-15 10:59:48 +01:00
parent 56695984b0
commit 515c0bfac4
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jscntxt.cpp
View File

@ -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")) {

23
js/src/old-configure.in
View File

@ -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