From 011dac290a9ea52539754aa64958df204425eb76 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Tue, 12 Dec 2017 22:44:02 +0100
Subject: Don't build GMP-clearkey when not building EME.

---
 browser/installer/package-manifest.in | 2 ++
 toolkit/toolkit.mozbuild              | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index c2269c069..dee6a3faa 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -821,8 +821,10 @@ bin/libfreebl_32int64_3.so
 
 
 ; media
+#ifdef MOZ_EME
 @RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@
 @RESPATH@/gmp-clearkey/0.1/clearkey.info
+#endif
 
 ; gfx
 #ifdef XP_WIN
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',
-- 
cgit v1.2.3