wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-24 16:17:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove OMX related options from configure

Browse source
This commit is contained in:
trav90 2018-12-16 08:05:21 -06:00 • committed by Roy Tam
commit 22183c7754
3 changed files with 0 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/moz.configure/old.configure
View file

@ -157,7 +157,6 @@ def old_configure_options(*options):
'--enable-accessibility', '--enable-accessibility',
'--enable-address-sanitizer', '--enable-address-sanitizer',
'--enable-alsa', '--enable-alsa',
'--enable-android-omx',
'--enable-b2g-bt', '--enable-b2g-bt',
'--enable-b2g-camera', '--enable-b2g-camera',
'--enable-b2g-ril', '--enable-b2g-ril',
@ -206,7 +205,6 @@ def old_configure_options(*options):
'--enable-nspr-build', '--enable-nspr-build',
'--enable-official-branding', '--enable-official-branding',
'--enable-official-vendor', '--enable-official-vendor',
'--enable-omx-plugin',
'--enable-oom-breakpoint', '--enable-oom-breakpoint',
'--enable-optimize', '--enable-optimize',
'--enable-parental-controls', '--enable-parental-controls',

43
old-configure.in
View file

@ -2216,8 +2216,6 @@ MOZ_WEBRTC_SIGNALING=
MOZ_WEBRTC_ASSERT_ALWAYS=1 MOZ_WEBRTC_ASSERT_ALWAYS=1
MOZ_WEBRTC_HARDWARE_AEC_NS= MOZ_WEBRTC_HARDWARE_AEC_NS=
MOZ_SCTP= MOZ_SCTP=
MOZ_ANDROID_OMX=
MOZ_OMX_PLUGIN=
MOZ_VPX_ERROR_CONCEALMENT= MOZ_VPX_ERROR_CONCEALMENT=
VPX_USE_YASM= VPX_USE_YASM=
VPX_ASFLAGS= VPX_ASFLAGS=
@ -2928,45 +2926,6 @@ if test -n "$MOZ_EME"; then
fi fi
dnl ======================================================== dnl ========================================================
dnl = Enable media plugin support
dnl ========================================================
if test "$OS_TARGET" = "Android"; then
dnl Enable support on android by default
MOZ_ANDROID_OMX=1
fi
MOZ_ARG_ENABLE_BOOL(android-omx,
[ --enable-android-omx Enable support for Android OMX media backend],
MOZ_ANDROID_OMX=1,
MOZ_ANDROID_OMX=)
if test -n "$MOZ_ANDROID_OMX"; then
AC_DEFINE(MOZ_ANDROID_OMX)
fi
dnl ========================================================
dnl = Enable building OMX media plugin (B2G or Android)
dnl ========================================================
if test "$OS_TARGET" = "Android"; then
dnl Enable support on android by default
MOZ_OMX_PLUGIN=1
fi
MOZ_ARG_ENABLE_BOOL(omx-plugin,
[ --enable-omx-plugin Enable building OMX plugin (B2G)],
MOZ_OMX_PLUGIN=1,
MOZ_OMX_PLUGIN=)
if test -n "$MOZ_OMX_PLUGIN"; then
if test "$OS_TARGET" = "Android"; then
dnl Only allow building OMX plugin on Android
AC_DEFINE(MOZ_OMX_PLUGIN)
else
dnl fail if we're not building on Android
AC_MSG_ERROR([OMX media plugin can only be built on Android])
fi
fi
dnl system libvpx Support dnl system libvpx Support
dnl ======================================================== dnl ========================================================
MOZ_ARG_WITH_BOOL(system-libvpx, MOZ_ARG_WITH_BOOL(system-libvpx,
@ -5552,8 +5511,6 @@ AC_SUBST(MOZ_TREMOR)
AC_SUBST(MOZ_FFVPX) AC_SUBST(MOZ_FFVPX)
AC_SUBST_LIST(FFVPX_ASFLAGS) AC_SUBST_LIST(FFVPX_ASFLAGS)
AC_SUBST(MOZ_EME) AC_SUBST(MOZ_EME)
AC_SUBST(MOZ_ANDROID_OMX)
AC_SUBST(MOZ_OMX_PLUGIN)
AC_SUBST(MOZ_VPX_ERROR_CONCEALMENT) AC_SUBST(MOZ_VPX_ERROR_CONCEALMENT)
AC_SUBST(VPX_USE_YASM) AC_SUBST(VPX_USE_YASM)
AC_SUBST_LIST(VPX_ASFLAGS) AC_SUBST_LIST(VPX_ASFLAGS)

9
toolkit/toolkit.mozbuild
View file

@ -58,15 +58,6 @@ if CONFIG['MOZ_WEBRTC']:
'/media/mtransport', '/media/mtransport',
] ]
if CONFIG['MOZ_OMX_PLUGIN']:
DIRS += [
'/media/omx-plugin/lib/ics/libutils',
'/media/omx-plugin/lib/ics/libstagefright',
'/media/omx-plugin/lib/ics/libvideoeditorplayer',
'/media/omx-plugin',
'/media/omx-plugin/kk',
]
if CONFIG['ENABLE_TESTS']: if CONFIG['ENABLE_TESTS']:
DIRS += ['/testing/specialpowers'] DIRS += ['/testing/specialpowers']