зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1382930 - Remove configure references to gonk; r=glandium
Some gaia-related code was also found and removed as part of the cleanup. MozReview-Commit-ID: DEjVSljzzu1 --HG-- extra : rebase_source : 58c4c34df44a258d90029853f29ea01338bd142b
This commit is contained in:
Gregory Szorc
Родитель
32e0bc9b81
Коммит
204ba452aa
|
|
@ -201,11 +201,7 @@ fi
|
|||
# bionic in Android < 4.1 doesn't support PIE
|
||||
# On OSX, the linker defaults to building PIE programs when targeting OSX 10.7.
|
||||
# On other Unix systems, some file managers (Nautilus) can't start PIE programs
|
||||
if test -n "$gonkdir" && test "$ANDROID_VERSION" -ge 16; then
|
||||
MOZ_PIE=1
|
||||
else
|
||||
MOZ_PIE=
|
||||
fi
|
||||
MOZ_PIE=
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(pie,
|
||||
[ --enable-pie Enable Position Independent Executables],
|
||||
|
|
|
|||
|
|
@ -909,13 +909,3 @@ def js_option(*args, **kwargs):
|
|||
return value.format(opt.option)
|
||||
|
||||
add_old_configure_arg(js_option)
|
||||
|
||||
|
||||
# Bug 1278542: This function is a workaround to resolve
|
||||
# |android_ndk_include|'s dependency on 'gonkdir.' The
|
||||
# actual implementation is located in b2g/moz.configure.
|
||||
# Remove this function as soon as 'android_ndk_include'
|
||||
# depends on 'target.'
|
||||
@depends('--help')
|
||||
def gonkdir(_):
|
||||
return None
|
||||
|
|
|
|||
|
|
@ -65,9 +65,9 @@ add_old_configure_assignment('YASM', have_yasm)
|
|||
# Android NDK
|
||||
# ==============================================================
|
||||
|
||||
@depends('--disable-compile-environment', build_project, gonkdir, '--help')
|
||||
def compiling_android(compile_env, build_project, gonkdir, _):
|
||||
return compile_env and (gonkdir or build_project in ('mobile/android', 'js'))
|
||||
@depends('--disable-compile-environment', build_project, '--help')
|
||||
def compiling_android(compile_env, build_project, _):
|
||||
return compile_env and build_project in ('mobile/android', 'js')
|
||||
|
||||
include('android-ndk.configure', when=compiling_android)
|
||||
|
||||
|
|
|
|||
|
|
@ -72,10 +72,6 @@ AC_SUBST(autoconfmk)
|
|||
|
||||
MOZ_ANDROID_NDK
|
||||
|
||||
if test -n "$gonkdir" ; then
|
||||
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"
|
||||
fi
|
||||
|
||||
case "$target" in
|
||||
*-apple-darwin*)
|
||||
MOZ_IOS_SDK
|
||||
|
|
|
|||
145
old-configure.in
145
old-configure.in
|
|
@ -84,65 +84,14 @@ if test "$COMPILE_ENVIRONMENT"; then
|
|||
MOZ_ANDROID_NDK
|
||||
fi # COMPILE_ENVIRONMENT
|
||||
|
||||
if test -n "$gonkdir"; then
|
||||
dnl export for js/src/configure. We can't pass the option down normally,
|
||||
dnl because it's a `--enable-project=b2g`-only option.
|
||||
export gonkdir
|
||||
kernel_name=`uname -s | tr "[[:upper:]]" "[[:lower:]]"`
|
||||
android_source="$gonkdir"
|
||||
ANDROID_SOURCE="$android_source"
|
||||
|
||||
case "$android_version" in
|
||||
15)
|
||||
CPPFLAGS="-I$gonkdir/frameworks/base/opengl/include -I$gonkdir/frameworks/base/native/include -I$gonkdir/frameworks/base/include -I$gonkdir/frameworks/base/services/camera -I$gonkdir/frameworks/base/include/media/ -I$gonkdir/frameworks/base/include/media/stagefright -I$gonkdir/frameworks/base/include/media/stagefright/openmax -I$gonkdir/frameworks/base/media/libstagefright/rtsp -I$gonkdir/frameworks/base/media/libstagefright/include -I$gonkdir/external/dbus -I$gonkdir/dalvik/libnativehelper/include/nativehelper $CPPFLAGS"
|
||||
MOZ_SECUREELEMENT=1
|
||||
;;
|
||||
17|18)
|
||||
CPPFLAGS="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include $CPPFLAGS"
|
||||
MOZ_SECUREELEMENT=1
|
||||
;;
|
||||
19)
|
||||
CPPFLAGS="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include $CPPFLAGS"
|
||||
MOZ_AUDIO_OFFLOAD=1
|
||||
MOZ_SECUREELEMENT=1
|
||||
AC_SUBST(MOZ_AUDIO_OFFLOAD)
|
||||
AC_DEFINE(MOZ_AUDIO_OFFLOAD)
|
||||
;;
|
||||
21|22)
|
||||
CPPFLAGS="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include $CPPFLAGS"
|
||||
MOZ_AUDIO_OFFLOAD=1
|
||||
AC_SUBST(MOZ_AUDIO_OFFLOAD)
|
||||
AC_DEFINE(MOZ_AUDIO_OFFLOAD)
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([Unsupported platform version: $android_version])
|
||||
;;
|
||||
esac
|
||||
|
||||
CPPFLAGS="-I$gonkdir/system -I$gonkdir/system/core/include -I$gonkdir/hardware/libhardware/include -I$gonkdir/external/valgrind/fxos-include $CPPFLAGS"
|
||||
LDFLAGS="-L$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib -Wl,-rpath-link=$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib $LDFLAGS"
|
||||
|
||||
case "$target" in
|
||||
*-android*|*-linuxandroid*)
|
||||
AC_DEFINE(ANDROID)
|
||||
AC_DEFINE_UNQUOTED(ANDROID_VERSION, $android_version)
|
||||
AC_DEFINE(HAVE_SYS_UIO_H)
|
||||
AC_DEFINE(HAVE_PTHREADS)
|
||||
|
||||
dnl ANDROID_VERSION is only required for the AC_SUBST below
|
||||
ANDROID_VERSION=$android_version
|
||||
AC_SUBST(ANDROID_VERSION)
|
||||
|
||||
direct_nspr_config=1
|
||||
|
||||
else
|
||||
case "$target" in
|
||||
*-android*|*-linuxandroid*)
|
||||
AC_DEFINE(ANDROID)
|
||||
;;
|
||||
*-linux*)
|
||||
AC_PATH_PROG(OBJCOPY,objcopy)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
*-linux*)
|
||||
AC_PATH_PROG(OBJCOPY,objcopy)
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$target" in
|
||||
*-apple-darwin*)
|
||||
|
|
@ -513,7 +462,7 @@ dnl ==============================================================
|
|||
if test "$COMPILE_ENVIRONMENT"; then
|
||||
MOZ_ARCH_OPTS
|
||||
else
|
||||
if test "$OS_TARGET" = Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
|
||||
if test "$OS_TARGET" = Android; then
|
||||
dnl Default Android builds to ARMv7.
|
||||
MOZ_ARCH=armv7-a
|
||||
fi
|
||||
|
|
@ -857,13 +806,9 @@ case "$target" in
|
|||
|
||||
*-android*|*-linuxandroid*)
|
||||
AC_DEFINE(NO_PW_GECOS)
|
||||
if test -n "$gonkdir"; then
|
||||
_PLATFORM_HAVE_RIL=1
|
||||
MOZ_SYNTH_PICO=1
|
||||
else
|
||||
if test "$COMPILE_ENVIRONMENT"; then
|
||||
MOZ_LINKER=1
|
||||
fi
|
||||
|
||||
if test "$COMPILE_ENVIRONMENT"; then
|
||||
MOZ_LINKER=1
|
||||
fi
|
||||
|
||||
MOZ_GFX_OPTIMIZE_MOBILE=1
|
||||
|
|
@ -2297,13 +2242,11 @@ dnl Ensure Android SDK and build-tools versions depending on
|
|||
dnl mobile target.
|
||||
dnl ========================================================
|
||||
|
||||
if test -z "$gonkdir" ; then
|
||||
case "$MOZ_BUILD_APP" in
|
||||
mobile/android)
|
||||
MOZ_ANDROID_SDK(23, 23, 23.0.3 23.0.1, 25.3.2 25.3.1)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
case "$MOZ_BUILD_APP" in
|
||||
mobile/android)
|
||||
MOZ_ANDROID_SDK(23, 23, 23.0.3 23.0.1, 25.3.2 25.3.1)
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
|
|
@ -2740,19 +2683,6 @@ if test -n "$MOZ_APPLEMEDIA"; then
|
|||
fi
|
||||
fi # COMPILE_ENVIRONMENT
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Built-in fragmented MP4 support.
|
||||
dnl ========================================================
|
||||
|
||||
if test x"$MOZ_WIDGET_TOOLKIT" = x"gonk" -a -n "$MOZ_FMP4" -a -n "$android_version"; then
|
||||
# we now know for sure that $android_version is not an empty string!
|
||||
if test "$android_version" -ge "18"; then
|
||||
MOZ_GONK_MEDIACODEC=1
|
||||
AC_SUBST(MOZ_GONK_MEDIACODEC)
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
dnl system libvpx Support
|
||||
dnl ========================================================
|
||||
MOZ_ARG_WITH_BOOL(system-libvpx,
|
||||
|
|
@ -2949,13 +2879,9 @@ MOZ_ARG_DISABLE_BOOL(pulseaudio,
|
|||
|
||||
if test -n "$MOZ_PULSEAUDIO"; then
|
||||
AC_DEFINE(MOZ_PULSEAUDIO)
|
||||
if test -z "$gonkdir"; then
|
||||
PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
|
||||
[echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
|
||||
AC_MSG_ERROR([pulseaudio audio backend requires libpulse development package])])
|
||||
else
|
||||
MOZ_PULSEAUDIO_CFLAGS="-I$gonkdir/external/pulseaudio/pulseaudio/src"
|
||||
fi
|
||||
PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
|
||||
[echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
|
||||
AC_MSG_ERROR([pulseaudio audio backend requires libpulse development package])])
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_PULSEAUDIO)
|
||||
|
|
@ -3549,9 +3475,6 @@ MOZ_ARG_DISABLE_BOOL(sandbox,
|
|||
dnl ========================================================
|
||||
dnl = Content process sandboxing
|
||||
dnl ========================================================
|
||||
if test -n "$gonkdir"; then
|
||||
MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX
|
||||
fi
|
||||
|
||||
case "$OS_TARGET" in
|
||||
WINNT)
|
||||
|
|
@ -4189,29 +4112,6 @@ if test -n "$MOZ_DISABLE_STARTUPCACHE"; then
|
|||
fi
|
||||
AC_SUBST(MOZ_DISABLE_STARTUPCACHE)
|
||||
|
||||
dnl =========================================
|
||||
dnl = Enable packaging Gaia with B2G desktop
|
||||
dnl =========================================
|
||||
if test x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
|
||||
if test -n "$GAIADIR" -a ! -d "$GAIADIR" ; then
|
||||
AC_MSG_ERROR([GAIADIR '$GAIADIR' isn't a valid directory])
|
||||
fi
|
||||
|
||||
AC_SUBST(GAIADIR)
|
||||
if test -n "$GAIADIR" ; then
|
||||
AC_DEFINE(PACKAGE_GAIA)
|
||||
fi
|
||||
|
||||
if test -n "$FXOS_SIMULATOR" -a -z "$GAIADIR" ; then
|
||||
AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined])
|
||||
fi
|
||||
|
||||
if test -n "$FXOS_SIMULATOR" ; then
|
||||
AC_DEFINE(FXOS_SIMULATOR)
|
||||
AC_SUBST(FXOS_SIMULATOR)
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Enable Pico Speech Synthesis (Gonk usually)
|
||||
dnl ========================================================
|
||||
|
|
@ -4668,7 +4568,7 @@ else
|
|||
fi
|
||||
|
||||
case "$MOZ_WIDGET_TOOLKIT" in
|
||||
android|gonk)
|
||||
android)
|
||||
TK_CFLAGS="$MOZ_CAIRO_CFLAGS $MOZ_PIXMAN_CFLAGS"
|
||||
TK_LIBS="$MOZ_CAIRO_LIBS $MOZ_PIXMAN_LIBS"
|
||||
;;
|
||||
|
|
@ -4704,11 +4604,6 @@ dnl option to disable necko's wifi scanner
|
|||
dnl
|
||||
|
||||
case "$OS_TARGET" in
|
||||
Android)
|
||||
if test -n "$gonkdir"; then
|
||||
NECKO_WIFI=1
|
||||
fi
|
||||
;;
|
||||
Darwin)
|
||||
if test -z "$MOZ_IOS"; then
|
||||
NECKO_WIFI=1
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче