Remove other gonk widget conditionals and unused files.

Tag #288.
This commit is contained in:
wolfbeast 2018-05-13 22:46:04 +02:00 • committed by Roy Tam
commit 74df182488
232 changed files with 256 additions and 36730 deletions

View file

@ -94,66 +94,15 @@ 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*)
ZLIB_DIR=yes
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*)
ZLIB_DIR=yes
AC_DEFINE(ANDROID)
;;
*-linux*)
AC_PATH_PROG(OBJCOPY,objcopy)
;;
esac
fi
;;
*-linux*)
AC_PATH_PROG(OBJCOPY,objcopy)
;;
esac
case "$target" in
*-apple-darwin*)
@ -563,7 +512,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
@ -926,13 +875,8 @@ 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
@ -2426,13 +2370,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.0.3 23.0.1)
;;
esac
fi
case "$MOZ_BUILD_APP" in
mobile/android)
MOZ_ANDROID_SDK(23, 23.0.3 23.0.1)
;;
esac
dnl ========================================================
dnl =
@ -2925,7 +2867,7 @@ AC_SUBST(MOZ_SCTP)
AC_SUBST(MOZ_SRTP)
AC_SUBST_LIST(MOZ_WEBRTC_X11_LIBS)
dnl Use integers over floats for audio on B2G and Android
dnl Use integers over floats for audio on Android
dnl (regarless of the CPU architecture, because audio
dnl backends for those platforms don't support floats. We also
dnl use integers on ARM with other OS, because it's more efficient.
@ -2984,18 +2926,6 @@ if test -n "$MOZ_DIRECTSHOW"; then
AC_DEFINE(MOZ_DIRECTSHOW)
fi;
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 ========================================================
dnl = EME support
dnl ========================================================
@ -3029,7 +2959,7 @@ fi
dnl ========================================================
dnl = Enable media plugin support
dnl ========================================================
if test "$OS_TARGET" = Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
if test "$OS_TARGET" = "Android"; then
dnl Enable support on android by default
MOZ_ANDROID_OMX=1
fi
@ -3046,7 +2976,7 @@ fi
dnl ========================================================
dnl = Enable building OMX media plugin (B2G or Android)
dnl ========================================================
if test "$OS_TARGET" = Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
if test "$OS_TARGET" = "Android"; then
dnl Enable support on android by default
MOZ_OMX_PLUGIN=1
fi
@ -3058,11 +2988,11 @@ MOZ_ARG_ENABLE_BOOL(omx-plugin,
if test -n "$MOZ_OMX_PLUGIN"; then
if test "$OS_TARGET" = "Android"; then
dnl Only allow building OMX plugin on Gonk (B2G) or Android
dnl Only allow building OMX plugin on Android
AC_DEFINE(MOZ_OMX_PLUGIN)
else
dnl fail if we're not building on Gonk or Android
AC_MSG_ERROR([OMX media plugin can only be built on B2G or Android])
dnl fail if we're not building on Android
AC_MSG_ERROR([OMX media plugin can only be built on Android])
fi
fi
@ -3271,13 +3201,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([Building 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([Building pulseaudio audio backend requires libpulse development package])])
fi
AC_SUBST(MOZ_PULSEAUDIO)
@ -4550,28 +4476,26 @@ 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
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
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" -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
if test -n "$FXOS_SIMULATOR" ; then
AC_DEFINE(FXOS_SIMULATOR)
AC_SUBST(FXOS_SIMULATOR)
fi
dnl ========================================================
dnl = Enable Pico Speech Synthesis (Gonk usually)
dnl = Enable Pico Speech Synthesis
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(synth-pico,
[ --enable-synth-pico Set compile flags necessary for compiling Pico Web Speech API ],
@ -5085,7 +5009,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"
;;
@ -5122,9 +5046,6 @@ dnl
case "$OS_TARGET" in
Android)
if test -n "$gonkdir"; then
NECKO_WIFI=1
fi
;;
Darwin)
if test -z "$MOZ_IOS"; then
@ -5171,7 +5092,7 @@ fi
dnl
dnl Always build Marionette if not Android or B2G
dnl
if test "$OS_TARGET" != Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
if test "$OS_TARGET" != "Android"; then
AC_DEFINE(ENABLE_MARIONETTE)
fi
AC_SUBST(ENABLE_MARIONETTE)