diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2017-12-12 22:44:02 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 10:06:22 +0100 |
| commit | 011dac290a9ea52539754aa64958df204425eb76 (patch) | |
| tree | 848f524fd758a952fe21d55ea0e746c57a5c402a | |
| parent | 507827c207dda138f22ce47ca988708986d17006 (diff) | |
| download | uxp-011dac290a9ea52539754aa64958df204425eb76.tar.gz | |
Don't build GMP-clearkey when not building EME.
| -rw-r--r-- | browser/installer/package-manifest.in | 2 | ||||
| -rw-r--r-- | toolkit/toolkit.mozbuild | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index c2269c069f..dee6a3faaa 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 d94f1240ac..7164a8ad58 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', |