Merge branch 'EME-work'

2 files changed, 7 insertions, 45 deletions

diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 85a01e658..4717af022 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -405,50 +405,8 @@ set_config('MOZ_FMP4', fmp4)
 set_define('MOZ_FMP4', fmp4)
 add_old_configure_assignment('MOZ_FMP4', fmp4)
 
-# EME Support
-# ==============================================================
-# Widevine is enabled by default in desktop browser builds.
-@depends(build_project, '--help')
-def eme_default(build_project, help):
-    if build_project == 'browser':
-        return 'widevine'
-
-option('--enable-eme',
-       nargs='*',
-       choices=('adobe','widevine',),
-       default=eme_default,
-       help='Enable support for Encrypted Media Extensions')
-
-@depends('--enable-eme', target)
-def enable_eme(value, target):
-    # Widevine EME by default enabled on desktop Windows, MacOS and Linux,
-    # x86 and x64 builds.
-    if (target.kernel in ('Darwin', 'WINNT', 'Linux') and
-        target.os not in ('Android', 'iOS') and
-        target.cpu in ('x86', 'x86_64')):
-        return value
-    elif value and value.origin != 'default':
-        die('%s is not supported on %s' % (value.format('--enable-eme'), target.alias))
-    # Return the same type of OptionValue (Positive or Negative), with an empty tuple.
-    return value.__class__(())
-
-@depends(enable_eme, fmp4)
-def eme(value, fmp4):
-    enabled = bool(value)
-    if value.origin == 'default':
-        enabled = enabled or fmp4
-    if enabled and not fmp4:
-        die('Encrypted Media Extension support requires '
-            'Fragmented MP4 support')
-    if enabled:
-        return True
-
-@depends(enable_eme)
-def eme_modules(value):
-    return value
-
-set_config('MOZ_EME_MODULES', eme_modules)
-
+# Miscellaneous
+# ==============================================================
 option(name='--enable-chrome-format',
        help='Select FORMAT of chrome files during packaging.',
        nargs=1,
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index d94f1240a..7164a8ad5 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -167,9 +167,13 @@ if CONFIG['ENABLE_MARIONETTE'] or CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('gonk', '
 
 DIRS += [
     '/tools/quitter',
-    '/media/gmp-clearkey/0.1',
 ]
 
+if CONFIG['MOZ_EME']:
+    DIRS += [
+    '/media/gmp-clearkey/0.1',
+    ]
+
 if CONFIG['ENABLE_TESTS']:
     DIRS += [
         '/testing/mochitest',