Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Side by Side Diff: remoting/host/win/BUILD.gn

Issue 2621223003: Fix building ASAN instrumented executables with custom entrypoints (Closed)
Patch Set: nit Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 ":dpi_aware_exe_manifest", 269 ":dpi_aware_exe_manifest",
270 ":remoting_core", 270 ":remoting_core",
271 ":remoting_windows_resources", 271 ":remoting_windows_resources",
272 ] 272 ]
273 273
274 sources = [ 274 sources = [
275 "$root_gen_dir/remoting/version.rc", 275 "$root_gen_dir/remoting/version.rc",
276 "entry_point.cc", 276 "entry_point.cc",
277 ] 277 ]
278 278
279 ldflags = [ 279 if (!is_asan) {
280 "/ENTRY:HostEntryPoint", 280 ldflags = [ "/ENTRY:HostEntryPoint" ]
281 # "/NODEFAULTLIB", 281 }
grt (UTC plus 2) 2017/01/16 15:41:17 maybe preserve a comment about this? was the origi
etienneb 2017/01/16 16:58:37 Done.
282 ]
283 } 282 }
284 283
285 executable("remoting_me2me_host") { 284 executable("remoting_me2me_host") {
286 configs += [ 285 configs += [
287 "//build/config/compiler:wexit_time_destructors", 286 "//build/config/compiler:wexit_time_destructors",
288 "//build/config/win:windowed", 287 "//build/config/win:windowed",
289 "//remoting/build/config:remoting_me2me_host", 288 "//remoting/build/config:remoting_me2me_host",
290 ] 289 ]
291 290
292 defines = host_predefines + [ "REMOTING_HOST_BINARY=BINARY_HOST_ME2ME" ] 291 defines = host_predefines + [ "REMOTING_HOST_BINARY=BINARY_HOST_ME2ME" ]
293 292
294 deps = [ 293 deps = [
295 ":dpi_aware_exe_manifest", 294 ":dpi_aware_exe_manifest",
296 ":remoting_core", 295 ":remoting_core",
297 ":remoting_windows_resources", 296 ":remoting_windows_resources",
298 ] 297 ]
299 298
300 sources = [ 299 sources = [
301 "$root_gen_dir/remoting/version.rc", 300 "$root_gen_dir/remoting/version.rc",
302 "entry_point.cc", 301 "entry_point.cc",
303 ] 302 ]
304 303
305 output_name = "remoting_host" 304 output_name = "remoting_host"
306 305
307 ldflags = [ "/ENTRY:HostEntryPoint" ] 306 if (!is_asan) {
307 ldflags = [ "/ENTRY:HostEntryPoint" ]
308 }
308 } 309 }
309 310
310 shared_library("remoting_core") { 311 shared_library("remoting_core") {
311 configs += [ "//build/config/compiler:wexit_time_destructors" ] 312 configs += [ "//build/config/compiler:wexit_time_destructors" ]
312 313
313 defines = host_predefines + [ 314 defines = host_predefines + [
314 "_ATL_APARTMENT_THREADED", 315 "_ATL_APARTMENT_THREADED",
315 "_ATL_CSTRING_EXPLICIT_CONSTRUCTORS", 316 "_ATL_CSTRING_EXPLICIT_CONSTRUCTORS",
316 "_ATL_NO_AUTOMATIC_NAMESPACE", 317 "_ATL_NO_AUTOMATIC_NAMESPACE",
317 "_ATL_NO_EXCEPTIONS", 318 "_ATL_NO_EXCEPTIONS",
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 deps += [ ":dpi_aware_uiaccess_require_admin_exe_manifest" ] 434 deps += [ ":dpi_aware_uiaccess_require_admin_exe_manifest" ]
434 } else { 435 } else {
435 deps += [ ":dpi_aware_exe_manifest" ] 436 deps += [ ":dpi_aware_exe_manifest" ]
436 } 437 }
437 438
438 sources = [ 439 sources = [
439 "$root_gen_dir/remoting/version.rc", 440 "$root_gen_dir/remoting/version.rc",
440 "entry_point.cc", 441 "entry_point.cc",
441 ] 442 ]
442 443
443 ldflags = [ 444 if (!is_asan) {
444 "/ENTRY:HostEntryPoint", 445 ldflags = [ "/ENTRY:HostEntryPoint" ]
445 # "/NODEFAULTLIB", 446 }
grt (UTC plus 2) 2017/01/16 15:41:17 same comment about comment
etienneb 2017/01/16 16:58:37 Done.
446 ]
447 } 447 }
448 448
449 executable("remoting_native_messaging_host") { 449 executable("remoting_native_messaging_host") {
450 configs += [ "//build/config/compiler:wexit_time_destructors" ] 450 configs += [ "//build/config/compiler:wexit_time_destructors" ]
451 451
452 defines = 452 defines =
453 host_predefines + [ "REMOTING_HOST_BINARY=BINARY_NATIVE_MESSAGING_HOST" ] 453 host_predefines + [ "REMOTING_HOST_BINARY=BINARY_NATIVE_MESSAGING_HOST" ]
454 454
455 deps = [ 455 deps = [
456 ":remoting_core", 456 ":remoting_core",
(...skipping 25 matching lines...) Expand all
482 482
483 output = "$root_gen_dir/remoting/{{source_name_part}}" 483 output = "$root_gen_dir/remoting/{{source_name_part}}"
484 484
485 locale_dir = webapp_locale_dir 485 locale_dir = webapp_locale_dir
486 486
487 encoding = "utf-16" 487 encoding = "utf-16"
488 488
489 locales = remoting_locales 489 locales = remoting_locales
490 } 490 }
491 # TODO(GYP) More Windows remoting targets from remoting_host_win.gypi 491 # TODO(GYP) More Windows remoting targets from remoting_host_win.gypi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698