summaryrefslogtreecommitdiff
path: root/chromium/third_party
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-12 10:15:34 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-10-04 10:18:46 +0200
commit246a59a77f9bbc58fb119fe878300f5eafc72710 (patch)
tree72bf9a8f46450fb9a3e3ed941a4d0482c4395eeb /chromium/third_party
parentc10be184309fb94b5656d6e652a3e02b1e3ca2a8 (diff)
downloadqtwebengine-chromium-246a59a77f9bbc58fb119fe878300f5eafc72710.tar.gz
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>
Diffstat (limited to 'chromium/third_party')
-rw-r--r--chromium/third_party/widevine/cdm/widevine.gni4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/widevine/cdm/widevine.gni b/chromium/third_party/widevine/cdm/widevine.gni
index d676aee4f2a..2eec30a13e2 100644
--- a/chromium/third_party/widevine/cdm/widevine.gni
+++ b/chromium/third_party/widevine/cdm/widevine.gni
@@ -4,7 +4,7 @@
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
-import("//build/config/chromeos/ui_mode.gni")
+import("//build/config/features.gni")
import("//media/media_options.gni")
declare_args() {
@@ -42,7 +42,7 @@ enable_library_widevine_cdm =
# Note: Not enabled on ChromeOS. See https://crbug.com/971433
enable_widevine_cdm_component =
enable_library_widevine_cdm &&
- (is_win || is_mac || is_linux || is_chromeos_lacros)
+ (is_win || is_mac || is_linux || is_chromeos_lacros) && !use_qt
# Enable (Windows) Media Foundation Widevine CDM. Desabled by default for test.
declare_args() {