diff options
| -rw-r--r-- | build/moz.configure/old.configure | 1 | ||||
| -rw-r--r-- | old-configure.in | 23 | ||||
| -rw-r--r-- | toolkit/toolkit.mozbuild | 5 |
3 files changed, 0 insertions, 29 deletions
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index 0a3b84be7b..492bb94d66 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -179,7 +179,6 @@ def old_configure_options(*options): '--enable-directshow', '--enable-dtrace', '--enable-dump-painting', - '--enable-eme', '--enable-elf-hack', '--enable-extensions', '--enable-faststripe', diff --git a/old-configure.in b/old-configure.in index ac11e93595..aa1750ec90 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2724,10 +2724,6 @@ dnl ======================================================== dnl = Enable Gecko Media Plugins dnl ======================================================== -if test -n "$MOZ_EME"; then - MOZ_GMP=1 -fi - if test -n "$MOZ_WEBRTC"; then MOZ_GMP=1 fi @@ -2794,25 +2790,6 @@ if test -n "$MOZ_APPLEMEDIA"; then fi fi # COMPILE_ENVIRONMENT -dnl ======================================================== -dnl = EME support -dnl ======================================================== - -MOZ_ARG_ENABLE_BOOL(eme, -[ --enable-eme Enable support for Encrypted Media Extensions ], - MOZ_EME=1, - MOZ_EME=) - - -if test -n "$MOZ_EME"; then - if test -z "$MOZ_FMP4"; then - AC_MSG_ERROR([Encrypted Media Extension support requires Fragmented MP4 support]) - fi - AC_DEFINE(MOZ_EME) -fi - -AC_SUBST(MOZ_EME) - MOZ_LIBVPX_CFLAGS= MOZ_LIBVPX_LIBS= diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild index bb5cac7cba..7ba79b11be 100644 --- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild @@ -135,11 +135,6 @@ DIRS += [ '/tools/quitter', ] -if CONFIG['MOZ_EME']: - DIRS += [ - '/media/gmp-clearkey/0.1', - ] - if CONFIG['ENABLE_TESTS']: DIRS += [ '/testing/mochitest', |