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

Unified Diff: remoting/host/BUILD.gn

Issue 1962913002: win/gn: Make building chromoting.msi work in 32-bit official builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: simpler Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/BUILD.gn
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
index fb8c668eb789c9efdc8df00e36baed8ba84202e7..c8edcc0362692a0a7dc1285f0838861b735ac787 100644
--- a/remoting/host/BUILD.gn
+++ b/remoting/host/BUILD.gn
@@ -1129,6 +1129,13 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host.
}
if (is_win && is_chrome_branded) {
+ if (target_cpu == "x86") {
+ # The script uses "ia32" instead of "x86".
+ msi_script_arch = "ia32"
+ } else {
+ msi_script_arch = target_cpu
+ }
+
# GYP version: remoting/remoting_host_win.gyp:remoting_host_installation
action("remoting_host_installation") {
deps = [
@@ -1144,7 +1151,7 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host.
"--intermediate_dir",
rebase_path("$root_gen_dir/installation", root_build_dir),
"--target_arch",
- "$target_cpu",
+ msi_script_arch,
rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
root_build_dir),
rebase_path(outputs[0], root_build_dir),
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698