2016-07-14 03:35:07 +02:00
|
|
|
diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc
|
2019-02-01 17:42:40 +01:00
|
|
|
index 6f0e5c53c37a..63551a75cbf7 100644
|
2016-07-14 03:35:07 +02:00
|
|
|
--- chrome/common/chrome_content_client.cc
|
|
|
|
|
+++ chrome/common/chrome_content_client.cc
|
2019-01-17 10:56:52 +01:00
|
|
|
@@ -97,7 +97,8 @@
|
2018-10-02 14:14:11 +02:00
|
|
|
// Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
|
|
|
|
|
// bundled and not a component. When the Widevine CDM is a component, it is
|
|
|
|
|
// registered in widevine_cdm_component_installer.cc.
|
2018-10-24 22:37:39 +02:00
|
|
|
-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
|
|
|
|
+#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \
|
2017-10-20 19:45:20 +02:00
|
|
|
+ defined(WIDEVINE_CDM_VERSION_STRING)
|
2018-10-02 14:14:11 +02:00
|
|
|
#define REGISTER_BUNDLED_WIDEVINE_CDM
|
|
|
|
|
#include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
|
|
|
|
|
// TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
|
2018-04-19 17:44:42 +02:00
|
|
|
diff --git third_party/widevine/cdm/BUILD.gn third_party/widevine/cdm/BUILD.gn
|
2019-02-01 17:42:40 +01:00
|
|
|
index 27b3e9150832..bf5b96c5f69f 100644
|
2018-04-19 17:44:42 +02:00
|
|
|
--- third_party/widevine/cdm/BUILD.gn
|
|
|
|
|
+++ third_party/widevine/cdm/BUILD.gn
|
2018-10-02 14:14:11 +02:00
|
|
|
@@ -5,6 +5,7 @@
|
|
|
|
|
import("//build/buildflag_header.gni")
|
2018-04-19 17:44:42 +02:00
|
|
|
import("//build/config/chrome_build.gni")
|
|
|
|
|
import("//build/config/features.gni")
|
|
|
|
|
+import("//cef/libcef/features/features.gni")
|
|
|
|
|
import("//media/cdm/library_cdm/cdm_paths.gni")
|
|
|
|
|
import("//media/media_options.gni")
|
|
|
|
|
import("//third_party/widevine/cdm/widevine.gni")
|
