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

Unified Diff: remoting/host/BUILD.gn

Issue 2073943002: [Chromoting] Disable building 64bit chromoting.msi file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | remoting/remoting_host_win.gypi » ('j') | remoting/remoting_host_win.gypi » ('J')
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 2ea13a8188cfbffc869bab407deda420586eec7c..c3cd168e3f5190afd69d1dd5bcb40b9fe59bc57b 100644
--- a/remoting/host/BUILD.gn
+++ b/remoting/host/BUILD.gn
@@ -1147,30 +1147,31 @@ if (enable_me2me_host) {
if (target_cpu == "x86") {
# The script uses "ia32" instead of "x86".
msi_script_arch = "ia32"
- } else {
- msi_script_arch = target_cpu
- }
joedow 2016/06/20 22:15:04 I think adding a comment would be good on why we o
Hzj_jie 2016/06/21 02:14:55 Done.
- # GYP version: remoting/remoting_host_win.gyp:remoting_host_installation
- action("remoting_host_installation") {
- deps = [
- "//remoting/host:remoting_me2me_host_archive",
- ]
- script = "../tools/zip2msi.py"
- outputs = [
- "$root_out_dir/chromoting.msi",
- ]
- args = [
- "--wix_path",
- rebase_path("//third_party/wix"),
- "--intermediate_dir",
- rebase_path("$root_gen_dir/installation", root_build_dir),
- "--target_arch",
- msi_script_arch,
- rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
- root_build_dir),
- rebase_path(outputs[0], root_build_dir),
- ]
+ # GYP version: remoting/remoting_host_win.gyp:remoting_host_installation
+ action("remoting_host_installation") {
+ deps = [
+ "//remoting/host:remoting_me2me_host_archive",
+ ]
+ script = "../tools/zip2msi.py"
+ outputs = [
+ "$root_out_dir/chromoting.msi",
+ ]
+ args = [
+ "--wix_path",
+ rebase_path("//third_party/wix"),
+ "--intermediate_dir",
+ rebase_path("$root_gen_dir/installation", root_build_dir),
+ "--target_arch",
+ msi_script_arch,
+ rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
+ root_build_dir),
+ rebase_path(outputs[0], root_build_dir),
+ ]
+ }
+ } else {
+ group("remoting_host_installation") {
joedow 2016/06/20 22:15:04 Is this empty target needed? The GYP change just
Hzj_jie 2016/06/21 02:14:55 In GYP, the default empty target has already been
+ }
}
}
}
« no previous file with comments | « no previous file | remoting/remoting_host_win.gypi » ('j') | remoting/remoting_host_win.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698