OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 import("//build/config/win/manifest.gni") | 7 import("//build/config/win/manifest.gni") |
8 import("//build/util/version.gni") | 8 import("//build/util/version.gni") |
9 import("//chrome/version.gni") | 9 import("//chrome/version.gni") |
10 import("//remoting/remoting_enable.gni") | 10 import("//remoting/remoting_enable.gni") |
(...skipping 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1137 "VERSION=$chrome_version_full", | 1137 "VERSION=$chrome_version_full", |
1138 "OFFICIAL_BUILD=$_official_build", | 1138 "OFFICIAL_BUILD=$_official_build", |
1139 ] | 1139 ] |
1140 } | 1140 } |
1141 } else { | 1141 } else { |
1142 group("remoting_me2me_host_archive") { | 1142 group("remoting_me2me_host_archive") { |
1143 } | 1143 } |
1144 } | 1144 } |
1145 | 1145 |
1146 if (is_win && is_chrome_branded) { | 1146 if (is_win && is_chrome_branded) { |
1147 # We do not release a 64 bits binary. So to avoid any potential | |
1148 # misunderstanding, we only build 32 bits MSI file. | |
1149 if (target_cpu == "x86") { | 1147 if (target_cpu == "x86") { |
1150 # The script uses "ia32" instead of "x86". | 1148 # The script uses "ia32" instead of "x86". |
1151 msi_script_arch = "ia32" | 1149 msi_script_arch = "ia32" |
| 1150 } else { |
| 1151 msi_script_arch = target_cpu |
| 1152 } |
1152 | 1153 |
1153 # GYP version: remoting/remoting_host_win.gyp:remoting_host_installation | 1154 # GYP version: remoting/remoting_host_win.gyp:remoting_host_installation |
1154 action("remoting_host_installation") { | 1155 action("remoting_host_installation") { |
1155 deps = [ | 1156 deps = [ |
1156 "//remoting/host:remoting_me2me_host_archive", | 1157 "//remoting/host:remoting_me2me_host_archive", |
1157 ] | 1158 ] |
1158 script = "../tools/zip2msi.py" | 1159 script = "../tools/zip2msi.py" |
1159 outputs = [ | 1160 outputs = [ |
1160 "$root_out_dir/chromoting.msi", | 1161 "$root_out_dir/chromoting.msi", |
1161 ] | 1162 ] |
1162 args = [ | 1163 args = [ |
1163 "--wix_path", | 1164 "--wix_path", |
1164 rebase_path("//third_party/wix"), | 1165 rebase_path("//third_party/wix"), |
1165 "--intermediate_dir", | 1166 "--intermediate_dir", |
1166 rebase_path("$root_gen_dir/installation", root_build_dir), | 1167 rebase_path("$root_gen_dir/installation", root_build_dir), |
1167 "--target_arch", | 1168 "--target_arch", |
1168 msi_script_arch, | 1169 msi_script_arch, |
1169 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", | 1170 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", |
1170 root_build_dir), | 1171 root_build_dir), |
1171 rebase_path(outputs[0], root_build_dir), | 1172 rebase_path(outputs[0], root_build_dir), |
1172 ] | 1173 ] |
1173 } | |
1174 } else { | |
1175 group("remoting_host_installation") { | |
1176 } | |
1177 } | 1174 } |
1178 } | 1175 } |
1179 } | 1176 } |
OLD | NEW |