diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 10:15:34 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-19 16:35:52 +0100 |
| commit | 147497227f5b7c4bf6ed94afefe089421dd9a6c9 (patch) | |
| tree | 5a4170796ca1dc834e5877ffc654d99effd38d61 | |
| parent | 48a8f61c464ed76b781d5ab562c3afc0719b5776 (diff) | |
Fix CDM on OSX and Windows with component installer
We will instead look for existing plugins like on Linux.
Change-Id: I27a32e78fcd30d0067d26c7e8e5f5ff43072018e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| -rw-r--r-- | chromium/third_party/widevine/cdm/widevine.gni | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/third_party/widevine/cdm/widevine.gni b/chromium/third_party/widevine/cdm/widevine.gni index 1fe47e92ffb..89cec766050 100644 --- a/chromium/third_party/widevine/cdm/widevine.gni +++ b/chromium/third_party/widevine/cdm/widevine.gni @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/config/chrome_build.gni") +import("//build/config/features.gni") import("//media/media_options.gni") declare_args() { @@ -33,7 +34,7 @@ enable_library_widevine_cdm = # and Windows. The CDM can be bundled regardless whether it's a component. See # below. enable_widevine_cdm_component = - enable_library_widevine_cdm && (is_win || is_mac) + enable_library_widevine_cdm && (is_win || is_mac) && !use_qt # Widevine CDM is bundled as part of Google Chrome builds. bundle_widevine_cdm = enable_library_widevine_cdm && is_chrome_branded |