diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-17 03:52:14 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-17 03:52:14 +0100 |
| commit | 680c3eadb6aaec1f3653636db081a519e0f62ef5 (patch) | |
| tree | f3608a518bbb9e31b0a42b9a10742fb11ef5b39b /old-configure.in | |
| parent | 6f3a1803c20bfa8dab0ac9344cc99f4828e9ed62 (diff) | |
| parent | 7457ca4ac175812fec0f8729689cc2e8746204d7 (diff) | |
| download | UXP-680c3eadb6aaec1f3653636db081a519e0f62ef5.tar UXP-680c3eadb6aaec1f3653636db081a519e0f62ef5.tar.gz UXP-680c3eadb6aaec1f3653636db081a519e0f62ef5.tar.lz UXP-680c3eadb6aaec1f3653636db081a519e0f62ef5.tar.xz UXP-680c3eadb6aaec1f3653636db081a519e0f62ef5.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 43 |
1 files changed, 0 insertions, 43 deletions
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) |