From 9b9a9f359ec490c8ce266d7d2c440e56db81e444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Riku=20Palom=C3=A4ki?= Date: Fri, 1 Nov 2019 14:19:48 +0000 Subject: [PATCH] Linux: Load *.bin files from DIR_ASSETS (see issue #1936) --- patch/patches/linux_assets_path_1936.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/patch/patches/linux_assets_path_1936.patch b/patch/patches/linux_assets_path_1936.patch index 081ab5917..70d884769 100644 --- a/patch/patches/linux_assets_path_1936.patch +++ b/patch/patches/linux_assets_path_1936.patch @@ -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