summaryrefslogtreecommitdiffstats
path: root/config/external/moz.build
diff options
context:
space:
mode:
authorThomas Groman <tgroman@nuegia.net>2020-06-14 18:02:51 -0700
committerThomas Groman <tgroman@nuegia.net>2020-06-14 18:02:51 -0700
commit0af0100030be9f2569d3dbf5ab746c2b97c009d0 (patch)
tree822e8fbbd063a22a47f42b0c7b4cd4c5a5a24b43 /config/external/moz.build
parent521f6fb61e7bd01f11802c85b6780a46277db51e (diff)
downloadUXP-0af0100030be9f2569d3dbf5ab746c2b97c009d0.tar
UXP-0af0100030be9f2569d3dbf5ab746c2b97c009d0.tar.gz
UXP-0af0100030be9f2569d3dbf5ab746c2b97c009d0.tar.lz
UXP-0af0100030be9f2569d3dbf5ab746c2b97c009d0.tar.xz
UXP-0af0100030be9f2569d3dbf5ab746c2b97c009d0.zip
Revert "Issue #1342 - Remove support for system libvpx"
This reverts commit 229f8412959a9480a9fa1784d6619aa5e97320c3.
Diffstat (limited to 'config/external/moz.build')
-rw-r--r--config/external/moz.build3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/external/moz.build b/config/external/moz.build
index f4013c18a..6b3617bf0 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -28,7 +28,8 @@ if CONFIG['MOZ_TREMOR']:
if CONFIG['MOZ_WEBM_ENCODER']:
external_dirs += ['media/libmkv']
-external_dirs += ['media/libvpx']
+if not CONFIG['MOZ_SYSTEM_LIBVPX']:
+ external_dirs += ['media/libvpx']
if CONFIG['MOZ_AV1']:
external_dirs += ['media/libaom']