Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 assert(is_win) | 5 assert(is_win) |
| 6 | 6 |
| 7 executable("crash_service") { | 7 executable("crash_service") { |
| 8 sources = [ | 8 sources = [ |
| 9 "main.cc", | 9 "main.cc", |
| 10 ] | 10 ] |
| 11 | 11 |
| 12 configs -= [ "//build/config/win:console" ] | 12 configs -= [ "//build/config/win:console" ] |
| 13 configs += [ "//build/config/win:windowed" ] | 13 configs += [ "//build/config/win:windowed" ] |
| 14 | 14 |
| 15 deps = [ | 15 deps = [ |
| 16 "//base", | 16 "//base", |
| 17 "//chrome/common:constants", | 17 "//chrome/common:constants", |
| 18 "//chrome/installer/util:with_no_strings", | 18 "//chrome/installer/util:with_no_strings", |
| 19 "//components/crash/content/tools:crash_service", | 19 "//components/crash/content/tools:crash_service", |
| 20 "//content/public/common:static_switches", | 20 "//content/public/common:static_switches", |
| 21 ] | 21 ] |
| 22 } | 22 } |
| 23 | 23 |
| 24 if (target_cpu == "x86" && current_cpu == "x86") { | 24 if (target_cpu == "x86" && current_cpu == "x86") { |
| 25 # Cross-compile a 64-bit version when compiling a 64-bit target. | 25 # Cross-compile a 64-bit version when compiling a 64-bit target. |
| 26 copy("crash_service_win64") { | 26 copy("crash_service_win64") { |
| 27 crash_service_64_target = ":crash_service(//build/toolchain/win:x64)" | 27 if (is_clang) { |
| 28 maybe_clang = "clang_" | |
| 29 } else { | |
| 30 maybe_clang = "" | |
| 31 } | |
| 32 crash_service_64_target = | |
| 33 ":crash_service(//build/toolchain/win:${maybe_clang}x64)" | |
|
Dirk Pranke
2016/03/29 18:56:08
lgtm.
There's a related issue in that is_clang i
| |
| 28 | 34 |
| 29 sources = [ | 35 sources = [ |
| 30 # It would be nice if get_target_outputs would work on the executable, | 36 # It would be nice if get_target_outputs would work on the executable, |
| 31 # but instead we have to manually compute the executable name. | 37 # but instead we have to manually compute the executable name. |
| 32 get_label_info(crash_service_64_target, "root_out_dir") + | 38 get_label_info(crash_service_64_target, "root_out_dir") + |
| 33 "/crash_service.exe", | 39 "/crash_service.exe", |
| 34 ] | 40 ] |
| 35 outputs = [ | 41 outputs = [ |
| 36 "$root_build_dir/crash_service_win64.exe", | 42 "$root_build_dir/crash_service_win64.exe", |
| 37 ] | 43 ] |
| 38 | 44 |
| 39 deps = [ | 45 deps = [ |
| 40 crash_service_64_target, | 46 crash_service_64_target, |
| 41 ] | 47 ] |
| 42 } | 48 } |
| 43 } | 49 } |
| OLD | NEW |