Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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/toolchain/win/midl.gni") | 5 import("//build/toolchain/win/midl.gni") |
| 6 import("//build/win/message_compiler.gni") | 6 import("//build/win/message_compiler.gni") |
| 7 import("//media/media_options.gni") | 7 import("//media/media_options.gni") |
| 8 import("//remoting/build/config/remoting_build.gni") | 8 import("//remoting/build/config/remoting_build.gni") |
| 9 import("//remoting/host/installer/win/generate_clsids.gni") | 9 import("//remoting/host/installer/win/generate_clsids.gni") |
| 10 | 10 |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 254 # Makes the .h/.rc files from the .mc file. | 254 # Makes the .h/.rc files from the .mc file. |
| 255 message_compiler("messages") { | 255 message_compiler("messages") { |
| 256 compile_generated_code = false | 256 compile_generated_code = false |
| 257 sources = get_target_outputs(":messages_localizing") | 257 sources = get_target_outputs(":messages_localizing") |
| 258 deps = [ | 258 deps = [ |
| 259 ":messages_localizing", | 259 ":messages_localizing", |
| 260 ] | 260 ] |
| 261 } | 261 } |
| 262 | 262 |
| 263 executable("remoting_console") { | 263 executable("remoting_console") { |
| 264 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 264 configs += [ |
| 265 "//build/config/compiler:wexit_time_destructors", | |
| 266 "//build/config/sanitizers:sanitizer_default_libs", | |
| 267 ] | |
| 265 | 268 |
| 266 defines = host_predefines + [ "BINARY=BINARY_HOST_ME2ME" ] | 269 defines = host_predefines + [ "BINARY=BINARY_HOST_ME2ME" ] |
| 267 | 270 |
| 268 deps = [ | 271 deps = [ |
| 269 ":dpi_aware_exe_manifest", | 272 ":dpi_aware_exe_manifest", |
| 270 ":remoting_core", | 273 ":remoting_core", |
| 271 ":remoting_windows_resources", | 274 ":remoting_windows_resources", |
| 275 "//build/config/sanitizers:deps", | |
|
joedow
2017/01/10 16:40:22
Just curious, why was deps updated for this target
etienneb
2017/01/11 16:05:32
This is adding sanitizers code into the executable
| |
| 272 ] | 276 ] |
| 273 | 277 |
| 274 sources = [ | 278 sources = [ |
| 275 "$root_gen_dir/remoting/version.rc", | 279 "$root_gen_dir/remoting/version.rc", |
| 276 "entry_point.cc", | 280 "entry_point.cc", |
| 277 ] | 281 ] |
| 278 | 282 |
| 279 ldflags = [ | 283 ldflags = [ |
| 280 "/ENTRY:HostEntryPoint", | 284 "/ENTRY:HostEntryPoint", |
| 281 # "/NODEFAULTLIB", | 285 # "/NODEFAULTLIB", |
| 282 ] | 286 ] |
| 283 } | 287 } |
| 284 | 288 |
| 285 executable("remoting_me2me_host") { | 289 executable("remoting_me2me_host") { |
| 286 configs += [ | 290 configs += [ |
| 287 "//build/config/compiler:wexit_time_destructors", | 291 "//build/config/compiler:wexit_time_destructors", |
| 288 "//build/config/win:windowed", | 292 "//build/config/win:windowed", |
| 293 "//build/config/sanitizers:sanitizer_default_libs", | |
| 289 "//remoting/build/config:remoting_me2me_host", | 294 "//remoting/build/config:remoting_me2me_host", |
| 290 ] | 295 ] |
| 291 | 296 |
| 292 defines = host_predefines + [ "BINARY=BINARY_HOST_ME2ME" ] | 297 defines = host_predefines + [ "BINARY=BINARY_HOST_ME2ME" ] |
| 293 | 298 |
| 294 deps = [ | 299 deps = [ |
| 295 ":dpi_aware_exe_manifest", | 300 ":dpi_aware_exe_manifest", |
| 296 ":remoting_core", | 301 ":remoting_core", |
| 297 ":remoting_windows_resources", | 302 ":remoting_windows_resources", |
| 298 ] | 303 ] |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 412 ] | 417 ] |
| 413 | 418 |
| 414 if (is_clang) { | 419 if (is_clang) { |
| 415 cflags = [ "-Wno-header-hygiene" ] | 420 cflags = [ "-Wno-header-hygiene" ] |
| 416 } | 421 } |
| 417 } | 422 } |
| 418 | 423 |
| 419 executable("remoting_desktop") { | 424 executable("remoting_desktop") { |
| 420 configs += [ | 425 configs += [ |
| 421 "//build/config/compiler:wexit_time_destructors", | 426 "//build/config/compiler:wexit_time_destructors", |
| 427 "//build/config/sanitizers:sanitizer_default_libs", | |
| 422 "//build/config/win:windowed", | 428 "//build/config/win:windowed", |
| 423 ] | 429 ] |
| 424 | 430 |
| 425 defines = host_predefines + [ "BINARY=BINARY_DESKTOP" ] | 431 defines = host_predefines + [ "BINARY=BINARY_DESKTOP" ] |
| 426 | 432 |
| 427 deps = [ | 433 deps = [ |
| 428 ":remoting_core", | 434 ":remoting_core", |
| 429 ":remoting_windows_resources", | 435 ":remoting_windows_resources", |
| 430 ] | 436 ] |
| 431 | 437 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 481 | 487 |
| 482 output = "$root_gen_dir/remoting/{{source_name_part}}" | 488 output = "$root_gen_dir/remoting/{{source_name_part}}" |
| 483 | 489 |
| 484 locale_dir = webapp_locale_dir | 490 locale_dir = webapp_locale_dir |
| 485 | 491 |
| 486 encoding = "utf-16" | 492 encoding = "utf-16" |
| 487 | 493 |
| 488 locales = remoting_locales | 494 locales = remoting_locales |
| 489 } | 495 } |
| 490 # TODO(GYP) More Windows remoting targets from remoting_host_win.gypi | 496 # TODO(GYP) More Windows remoting targets from remoting_host_win.gypi |
| OLD | NEW |