diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:19:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:01:50 +0000 |
| commit | 51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch) | |
| tree | 835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/components/cdm/renderer | |
| parent | 6036726eb981b6c4b42047513b9d3f4ac865daac (diff) | |
| download | qtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz | |
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/cdm/renderer')
4 files changed, 22 insertions, 17 deletions
diff --git a/chromium/components/cdm/renderer/BUILD.gn b/chromium/components/cdm/renderer/BUILD.gn index cbf84711840..c8e6160ff68 100644 --- a/chromium/components/cdm/renderer/BUILD.gn +++ b/chromium/components/cdm/renderer/BUILD.gn @@ -3,13 +3,20 @@ # found in the LICENSE file. import("//build/config/jumbo.gni") +import("//third_party/widevine/cdm/widevine.gni") jumbo_static_library("renderer") { sources = [ "external_clear_key_key_system_properties.cc", "external_clear_key_key_system_properties.h", - "widevine_key_system_properties.cc", - "widevine_key_system_properties.h", + ] + deps = [ + "//base", + "//components/cdm/common", + "//content/public/renderer", + "//media", + "//media:media_buildflags", + "//third_party/widevine/cdm:buildflags", ] if (is_android) { @@ -19,12 +26,11 @@ jumbo_static_library("renderer") { ] } - deps = [ - "//base", - "//components/cdm/common", - "//content/public/renderer", - "//media", - "//media:media_buildflags", - "//third_party/widevine/cdm:headers", - ] + if (enable_widevine) { + sources += [ + "widevine_key_system_properties.cc", + "widevine_key_system_properties.h", + ] + deps += [ "//third_party/widevine/cdm:headers" ] + } } diff --git a/chromium/components/cdm/renderer/DEPS b/chromium/components/cdm/renderer/DEPS index ac8ac8d99f3..65b9b373547 100644 --- a/chromium/components/cdm/renderer/DEPS +++ b/chromium/components/cdm/renderer/DEPS @@ -1,4 +1,5 @@ include_rules = [ "+content/public/renderer", + "+third_party/widevine/cdm/buildflags.h", "+third_party/widevine/cdm/widevine_cdm_common.h", ] diff --git a/chromium/components/cdm/renderer/android_key_systems.cc b/chromium/components/cdm/renderer/android_key_systems.cc index 3afe736b59b..280be2879b3 100644 --- a/chromium/components/cdm/renderer/android_key_systems.cc +++ b/chromium/components/cdm/renderer/android_key_systems.cc @@ -14,8 +14,7 @@ #include "media/base/eme_constants.h" #include "media/base/media_switches.h" #include "media/media_buildflags.h" - -#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. +#include "third_party/widevine/cdm/widevine_cdm_common.h" using media::EmeConfigRule; using media::EmeFeatureSupport; diff --git a/chromium/components/cdm/renderer/widevine_key_system_properties.cc b/chromium/components/cdm/renderer/widevine_key_system_properties.cc index 0f58b1fa762..89ea042e215 100644 --- a/chromium/components/cdm/renderer/widevine_key_system_properties.cc +++ b/chromium/components/cdm/renderer/widevine_key_system_properties.cc @@ -4,11 +4,12 @@ #include "components/cdm/renderer/widevine_key_system_properties.h" +#include "third_party/widevine/cdm/buildflags.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" -#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. - -#if defined(WIDEVINE_CDM_AVAILABLE) +#if !BUILDFLAG(ENABLE_WIDEVINE) +#error This file should only be built when Widevine is enabled. +#endif using media::EmeConfigRule; using media::EmeFeatureSupport; @@ -185,5 +186,3 @@ EmeFeatureSupport WidevineKeySystemProperties::GetDistinctiveIdentifierSupport() } } // namespace cdm - -#endif // WIDEVINE_CDM_AVAILABLE |