| 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("//remoting/remoting_enable.gni") | 9 import("//remoting/remoting_enable.gni") |
| 10 import("//remoting/remoting_locales.gni") | 10 import("//remoting/remoting_locales.gni") |
| (...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1122 "VERSION=$chrome_version_full", | 1122 "VERSION=$chrome_version_full", |
| 1123 "OFFICIAL_BUILD=$_official_build", | 1123 "OFFICIAL_BUILD=$_official_build", |
| 1124 ] | 1124 ] |
| 1125 } | 1125 } |
| 1126 } else { | 1126 } else { |
| 1127 group("remoting_me2me_host_archive") { | 1127 group("remoting_me2me_host_archive") { |
| 1128 } | 1128 } |
| 1129 } | 1129 } |
| 1130 | 1130 |
| 1131 if (is_win && is_chrome_branded) { | 1131 if (is_win && is_chrome_branded) { |
| 1132 if (target_cpu == "x86") { |
| 1133 # The script uses "ia32" instead of "x86". |
| 1134 msi_script_arch = "ia32" |
| 1135 } else { |
| 1136 msi_script_arch = target_cpu |
| 1137 } |
| 1138 |
| 1132 # GYP version: remoting/remoting_host_win.gyp:remoting_host_installation | 1139 # GYP version: remoting/remoting_host_win.gyp:remoting_host_installation |
| 1133 action("remoting_host_installation") { | 1140 action("remoting_host_installation") { |
| 1134 deps = [ | 1141 deps = [ |
| 1135 "//remoting/host:remoting_me2me_host_archive", | 1142 "//remoting/host:remoting_me2me_host_archive", |
| 1136 ] | 1143 ] |
| 1137 script = "../tools/zip2msi.py" | 1144 script = "../tools/zip2msi.py" |
| 1138 outputs = [ | 1145 outputs = [ |
| 1139 "$root_out_dir/chromoting.msi", | 1146 "$root_out_dir/chromoting.msi", |
| 1140 ] | 1147 ] |
| 1141 args = [ | 1148 args = [ |
| 1142 "--wix_path", | 1149 "--wix_path", |
| 1143 rebase_path("//third_party/wix"), | 1150 rebase_path("//third_party/wix"), |
| 1144 "--intermediate_dir", | 1151 "--intermediate_dir", |
| 1145 rebase_path("$root_gen_dir/installation", root_build_dir), | 1152 rebase_path("$root_gen_dir/installation", root_build_dir), |
| 1146 "--target_arch", | 1153 "--target_arch", |
| 1147 "$target_cpu", | 1154 msi_script_arch, |
| 1148 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", | 1155 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", |
| 1149 root_build_dir), | 1156 root_build_dir), |
| 1150 rebase_path(outputs[0], root_build_dir), | 1157 rebase_path(outputs[0], root_build_dir), |
| 1151 ] | 1158 ] |
| 1152 } | 1159 } |
| 1153 } | 1160 } |
| 1154 } | 1161 } |
| 1155 } | 1162 } |
| OLD | NEW |