| 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 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1210 } else { | 1210 } else { |
| 1211 _branding = "Chromium" | 1211 _branding = "Chromium" |
| 1212 } | 1212 } |
| 1213 | 1213 |
| 1214 if (is_official_build) { | 1214 if (is_official_build) { |
| 1215 _official_build = "1" | 1215 _official_build = "1" |
| 1216 } else { | 1216 } else { |
| 1217 _official_build = "0" | 1217 _official_build = "0" |
| 1218 } | 1218 } |
| 1219 | 1219 |
| 1220 _generated_files = rebase_path( | 1220 # Due to GN build issue http://crbug.com/633650, we need to actively set |
| 1221 [ | 1221 # inputs parameter to tell GN to depend on these files. So change to each |
| 1222 "$root_out_dir/remote_assistance_host.exe", | 1222 # following files will trigger this target to be rebuilt. |
| 1223 "$root_out_dir/remote_security_key.exe", | 1223 # TODO(zijiehe): Remove inputs parameter once bug 633650 has been |
| 1224 "$root_out_dir/remoting_core.dll", | 1224 # addressed. |
| 1225 "$root_out_dir/remoting_desktop.exe", | 1225 inputs = [ |
| 1226 "$root_out_dir/remoting_host.exe", | 1226 "$root_out_dir/remote_assistance_host.exe", |
| 1227 "$root_out_dir/remoting_native_messaging_host.exe", | 1227 "$root_out_dir/remote_security_key.exe", |
| 1228 "$root_out_dir/remoting_start_host.exe", | 1228 "$root_out_dir/remoting_core.dll", |
| 1229 "$root_gen_dir/remoting/CREDITS.txt", | 1229 "$root_out_dir/remoting_desktop.exe", |
| 1230 "$root_out_dir/remoting/com.google.chrome.remote_assistance.json
", | 1230 "$root_out_dir/remoting_host.exe", |
| 1231 "$root_out_dir/remoting/com.google.chrome.remote_desktop.json", | 1231 "$root_out_dir/remoting_native_messaging_host.exe", |
| 1232 "$root_out_dir/icudtl.dat", | 1232 "$root_out_dir/remoting_start_host.exe", |
| 1233 ], | 1233 "$root_gen_dir/remoting/CREDITS.txt", |
| 1234 root_build_dir) | 1234 "$root_out_dir/remoting/com.google.chrome.remote_assistance.json", |
| 1235 "$root_out_dir/remoting/com.google.chrome.remote_desktop.json", |
| 1236 "$root_out_dir/icudtl.dat", |
| 1237 ] |
| 1238 |
| 1239 _generated_files = rebase_path(inputs, root_build_dir) |
| 1235 _extra_files = [] | 1240 _extra_files = [] |
| 1236 | 1241 |
| 1237 args = | 1242 args = |
| 1238 [ | 1243 [ |
| 1239 rebase_path("$root_gen_dir/remoting_installation", root_build_dir), | 1244 rebase_path("$root_gen_dir/remoting_installation", root_build_dir), |
| 1240 rebase_path(_output, root_build_dir), | 1245 rebase_path(_output, root_build_dir), |
| 1241 "--source-file-roots", | 1246 "--source-file-roots", |
| 1242 rebase_path("//remoting/host/installer/win"), | 1247 rebase_path("//remoting/host/installer/win"), |
| 1243 "--source-files", | 1248 "--source-files", |
| 1244 rebase_path("//remoting/host/installer/win/chromoting.wxs"), | 1249 rebase_path("//remoting/host/installer/win/chromoting.wxs"), |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1555 root_build_dir), | 1560 root_build_dir), |
| 1556 rebase_path(outputs[0], root_build_dir), | 1561 rebase_path(outputs[0], root_build_dir), |
| 1557 ] | 1562 ] |
| 1558 } | 1563 } |
| 1559 } else { | 1564 } else { |
| 1560 group("remoting_host_installation") { | 1565 group("remoting_host_installation") { |
| 1561 } | 1566 } |
| 1562 } | 1567 } |
| 1563 } | 1568 } |
| 1564 } | 1569 } |
| OLD | NEW |