Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(578)

Unified Diff: chrome/common/media/cdm_host_file_path.cc

Issue 2647393004: Add Widevine signature files into Mac build (Closed)
Patch Set: move framework.sig file Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/BUILD.gn ('k') | third_party/widevine/cdm/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/media/cdm_host_file_path.cc
diff --git a/chrome/common/media/cdm_host_file_path.cc b/chrome/common/media/cdm_host_file_path.cc
index ea1974fdcfa18fe032503361e4ce81e05d643e40..99c49fac13bbf384af93e009eee8b700d152c2f2 100644
--- a/chrome/common/media/cdm_host_file_path.cc
+++ b/chrome/common/media/cdm_host_file_path.cc
@@ -80,11 +80,14 @@ void AddCdmHostFilePaths(
#elif defined(OS_MACOSX)
// Framework signature is next to the framework directory, not next to
- // the actual framework executable.
+ // the actual framework executable. As the framework is now internally
sky 2017/02/22 17:00:07 Isn't there a better way to get the location rathe
jrummell 2017/02/22 23:14:51 It turns out that with the symlinks added it still
+ // versioned, the signature file is up three directories. Chrome also
+ // externally versions the framework, so there will only ever be one
+ // internal version of the framework per outer version directory.
base::FilePath chrome_framework_path =
base::mac::FrameworkBundlePath().Append(chrome::kFrameworkExecutableName);
- base::FilePath chrome_framework_sig_path =
- GetSigFilePath(base::mac::FrameworkBundlePath().DirName().Append(
+ base::FilePath chrome_framework_sig_path = GetSigFilePath(
+ base::mac::FrameworkBundlePath().DirName().DirName().DirName().Append(
chrome::kFrameworkExecutableName));
DVLOG(2) << __func__
« no previous file with comments | « chrome/BUILD.gn ('k') | third_party/widevine/cdm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698