diff options
| author | trav90 <travawine@palemoon.org> | 2018-12-16 08:05:21 -0600 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-12-16 08:05:21 -0600 |
| commit | ea6cc74f2e76cf79b0698832bdb4cfda0e20bd3d (patch) | |
| tree | bb1bfc6add9d097c77d0f3bcdeb2056b13ecc4af | |
| parent | ec2346967015044f5a6ebef03f51ccb5665206b8 (diff) | |
| download | UXP-ea6cc74f2e76cf79b0698832bdb4cfda0e20bd3d.tar UXP-ea6cc74f2e76cf79b0698832bdb4cfda0e20bd3d.tar.gz UXP-ea6cc74f2e76cf79b0698832bdb4cfda0e20bd3d.tar.lz UXP-ea6cc74f2e76cf79b0698832bdb4cfda0e20bd3d.tar.xz UXP-ea6cc74f2e76cf79b0698832bdb4cfda0e20bd3d.zip | |
Remove OMX related options from configure
| -rw-r--r-- | build/moz.configure/old.configure | 2 | ||||
| -rw-r--r-- | old-configure.in | 43 | ||||
| -rw-r--r-- | toolkit/toolkit.mozbuild | 9 |
3 files changed, 0 insertions, 54 deletions
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index f112e6bdf..59dc8b57b 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -157,7 +157,6 @@ def old_configure_options(*options): '--enable-accessibility', '--enable-address-sanitizer', '--enable-alsa', - '--enable-android-omx', '--enable-b2g-bt', '--enable-b2g-camera', '--enable-b2g-ril', @@ -206,7 +205,6 @@ def old_configure_options(*options): '--enable-nspr-build', '--enable-official-branding', '--enable-official-vendor', - '--enable-omx-plugin', '--enable-oom-breakpoint', '--enable-optimize', '--enable-parental-controls', diff --git a/old-configure.in b/old-configure.in index 74f1142a5..ba3b75ef3 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2211,8 +2211,6 @@ MOZ_WEBRTC_SIGNALING= MOZ_WEBRTC_ASSERT_ALWAYS=1 MOZ_WEBRTC_HARDWARE_AEC_NS= MOZ_SCTP= -MOZ_ANDROID_OMX= -MOZ_OMX_PLUGIN= MOZ_VPX_ERROR_CONCEALMENT= VPX_USE_YASM= VPX_ASFLAGS= @@ -2923,45 +2921,6 @@ if test -n "$MOZ_EME"; then fi 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 ======================================================== MOZ_ARG_WITH_BOOL(system-libvpx, @@ -5466,8 +5425,6 @@ AC_SUBST(MOZ_TREMOR) AC_SUBST(MOZ_FFVPX) AC_SUBST_LIST(FFVPX_ASFLAGS) AC_SUBST(MOZ_EME) -AC_SUBST(MOZ_ANDROID_OMX) -AC_SUBST(MOZ_OMX_PLUGIN) AC_SUBST(MOZ_VPX_ERROR_CONCEALMENT) AC_SUBST(VPX_USE_YASM) AC_SUBST_LIST(VPX_ASFLAGS) diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild index b4aebbef0..da4e7cd85 100644 --- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild @@ -58,15 +58,6 @@ if CONFIG['MOZ_WEBRTC']: '/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']: DIRS += ['/testing/specialpowers'] |