Linux: Load *.bin files from DIR_ASSETS (see issue #1936)

This commit is contained in:
Riku Palomäki 2019-11-01 14:19:48 +00:00 committed by Marshall Greenblatt
parent b51a4de540
commit 9b9a9f359e
1 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,16 @@
diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc
index 720b92a1a3a7..4e5551a64ced 100644
--- content/browser/child_process_launcher_helper_linux.cc
+++ content/browser/child_process_launcher_helper_linux.cc
@@ -177,7 +177,7 @@ void ChildProcessLauncherHelper::ResetRegisteredFilesForTesting() {
base::File OpenFileToShare(const base::FilePath& path,
base::MemoryMappedFile::Region* region) {
base::FilePath exe_dir;
- bool result = base::PathService::Get(base::BasePathKey::DIR_EXE, &exe_dir);
+ bool result = base::PathService::Get(base::BasePathKey::DIR_ASSETS, &exe_dir);
DCHECK(result);
base::File file(exe_dir.Append(path),
base::File::FLAG_OPEN | base::File::FLAG_READ);
diff --git sandbox/linux/suid/client/setuid_sandbox_host.cc sandbox/linux/suid/client/setuid_sandbox_host.cc
index a277ffa5eb59..3935b9f8c17c 100644
--- sandbox/linux/suid/client/setuid_sandbox_host.cc