From d254257bfc9e018550c21d7f7ed130898f0a4faa Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Wed, 26 Sep 2018 22:37:50 -0700 Subject: [PATCH] Re-implement work done originally done with: - https://github.com/brave/brave-core/pull/507 - https://github.com/brave/brave-core/pull/510 This code was backed out with https://github.com/brave/brave-core/pull/513 (so we can do 0.55.x and 0.56.x builds in the meantime). --- patches/media-media_options.gni.patch | 13 +++++++++++++ patches/third_party-widevine-cdm-widevine.gni.patch | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 patches/media-media_options.gni.patch create mode 100644 patches/third_party-widevine-cdm-widevine.gni.patch diff --git a/patches/media-media_options.gni.patch b/patches/media-media_options.gni.patch new file mode 100644 index 000000000000..04e78354c83e --- /dev/null +++ b/patches/media-media_options.gni.patch @@ -0,0 +1,13 @@ +diff --git a/media/media_options.gni b/media/media_options.gni +index d8e20f62c19d34d036760883a02d3350aa696f1b..b50672e5e84652d896561af669cc712458cd2912 100644 +--- a/media/media_options.gni ++++ b/media/media_options.gni +@@ -146,7 +146,7 @@ declare_args() { + # Enables host verification for CDMs. + # Windows and Mac. + enable_cdm_host_verification = +- enable_library_cdms && (is_mac || is_win) && is_chrome_branded ++ enable_library_cdms && (is_mac || is_win) && is_official_build + + # Enable Storage ID which is used by CDMs. This is only available with chrome + # branding, but may be overridden by other embedders. diff --git a/patches/third_party-widevine-cdm-widevine.gni.patch b/patches/third_party-widevine-cdm-widevine.gni.patch new file mode 100644 index 000000000000..60ed95264b29 --- /dev/null +++ b/patches/third_party-widevine-cdm-widevine.gni.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni +index 82a93622585a424f56c3567050f9ba4822de6c1e..9c89d9a0c0a8b2df4e082cfd1ef9ace6ed8fc929 100644 +--- a/third_party/widevine/cdm/widevine.gni ++++ b/third_party/widevine/cdm/widevine.gni +@@ -11,7 +11,7 @@ declare_args() { + } + + enable_widevine_cdm_host_verification = +- (is_chrome_branded || enable_widevine) && enable_cdm_host_verification ++ enable_widevine && enable_cdm_host_verification + + # Only bundle Widevine CDM in Google Chrome builds. + should_bundle_widevine_cdm = is_chrome_branded && enable_library_cdms