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

Unified Diff: shell/BUILD.gn

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/BUILD.gn
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index 56c6596b7a2dcf4a4bd75664c3d6463b1fad1916..a83a9cbf8c46342f9c552ebf040f7ea80b6cc9b6 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -83,7 +83,7 @@ if (!mojo_use_prebuilt_mojo_shell) {
"desktop/main.cc",
]
- deps = shell_common_deps
+ deps = shell_common_deps + [ ":mojo_shell_child_x86" ]
data_deps = shell_common_data_deps
}
@@ -105,6 +105,16 @@ if (!mojo_use_prebuilt_mojo_shell) {
"//mojo/message_pump",
]
}
+
+ group("mojo_shell_child_x86") {
Petr Hosek 2015/09/14 19:13:51 Ditto here.
Sean Klein 2015/09/15 18:37:50 Naming "mojo_shell_child_32_bit", since "mojo_shel
+ # This group is required to run any 32-bit child process.
+ deps = []
+ if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) {
+ deps = [
+ ":mojo_shell_child(//build/toolchain/linux:clang_x86)",
Mark Seaborn 2015/09/14 18:38:58 Nit: Shouldn't this come with the same warning as
Sean Klein 2015/09/15 18:37:50 Done.
+ ]
+ }
+ }
} # !mojo_use_prebuilt_mojo_shell
# Files used both by mojo_shell and mojo_shell_child (and tests).

Powered by Google App Engine
This is Rietveld 408576698