1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
description: try alternative locations for libwidevinecdm.so
- $HOME/.local/lib/ (snap-friendly, see https://launchpad.net/bugs/1738149)
author: Olivier Tilloy <[email protected]>
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -339,6 +339,11 @@ bool PathProvider(int key, base::FilePath* result) {
#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
BUILDFLAG(BUNDLE_WIDEVINE_CDM)
case chrome::DIR_BUNDLED_WIDEVINE_CDM:
+ base::PathService::Get(base::DIR_HOME, &cur);
+ cur = cur.Append(FILE_PATH_LITERAL(".local/lib/libwidevinecdm.so"));
+ if (base::PathExists(cur)) {
+ break;
+ }
if (!GetComponentDirectory(&cur))
return false;
#if !BUILDFLAG(IS_CHROMEOS_ASH)
--- a/third_party/widevine/cdm/BUILD.gn
+++ b/third_party/widevine/cdm/BUILD.gn
@@ -15,7 +15,7 @@ buildflag_header("buildflags") {
flags = [
"ENABLE_WIDEVINE=$enable_widevine",
- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm",
+ "BUNDLE_WIDEVINE_CDM=true",
"ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component",
]
}
|
