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

Unified Diff: shell/context.cc

Issue 1341873002: Enabling 64-bit mojo shell to launch 32-bit child to handle nonsfi content. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 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
Index: shell/context.cc
diff --git a/shell/context.cc b/shell/context.cc
index 2e9513064dc7dba71e2b9a3fd6ea179e85561c4a..085e09bee20c6ba5f4cc54aa3fcf674107c88346 100644
--- a/shell/context.cc
+++ b/shell/context.cc
@@ -257,6 +257,8 @@ bool Context::Init() {
base::CommandLine::ForCurrentProcess()->GetProgram());
base::FilePath shell_child_path =
shell_path.DirName().AppendASCII("mojo_shell_child");
+ mojo_shell_child_path_32_bit_ =
+ shell_path.DirName().AppendASCII("clang_x86/mojo_shell_child");
Sean Klein 2015/09/14 18:10:33 I'm not entirely sure if I should be dependent on
Mark Seaborn 2015/09/14 18:38:58 I think this depends how mojo_shell gets packaged.
Petr Hosek 2015/09/14 19:13:52 The path is an artifact of the build system (GN in
Sean Klein 2015/09/15 18:37:50 Using a copy rule in the gn files -- now there are
return InitWithPaths(shell_child_path);
}

Powered by Google App Engine
This is Rietveld 408576698