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

Side by Side Diff: content/shell/BUILD.gn

Issue 1240893004: Preliminary support for Windows manifests in the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « cloud_print/service/win/service.gyp ('k') | remoting/host/win/common-controls.manifest » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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("//tools/grit/repack.gni") 8 import("//tools/grit/repack.gni")
8 import("//tools/grit/grit_rule.gni") 9 import("//tools/grit/grit_rule.gni")
9 if (is_android) { 10 if (is_android) {
10 import("//build/config/android/config.gni") 11 import("//build/config/android/config.gni")
11 } 12 }
12 13
13 declare_args() { 14 declare_args() {
14 content_shell_product_name = "Content Shell" 15 content_shell_product_name = "Content Shell"
15 16
16 # The "19" is so that sites that sniff for version think that this is 17 # The "19" is so that sites that sniff for version think that this is
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 } 388 }
388 389
389 sources += [ "$root_gen_dir/blink/devtools_resources.pak" ] 390 sources += [ "$root_gen_dir/blink/devtools_resources.pak" ]
390 deps += [ "//content/browser/devtools:resources" ] 391 deps += [ "//content/browser/devtools:resources" ]
391 output = "$root_out_dir/content_shell.pak" 392 output = "$root_out_dir/content_shell.pak"
392 } 393 }
393 394
394 # TODO(GYP): Figure out what this should be on android 395 # TODO(GYP): Figure out what this should be on android
395 # and make linking this work on the Mac. 396 # and make linking this work on the Mac.
396 if (!is_android && !is_mac) { 397 if (!is_android && !is_mac) {
398 # TODO(brettw) when GYP is no longer necessary, delete
399 # content/shell/app/shell.exe.manifest. This file is not used in GN.
397 executable("content_shell") { 400 executable("content_shell") {
398 testonly = true 401 testonly = true
399 402
400 # TODO(GYP) mac resource bundle stuff for this target. 403 # TODO(GYP) mac resource bundle stuff for this target.
401 # TODO(GYP) Windows content shell settings: 404 # TODO(GYP) Windows content shell settings:
402 # - Manifest.
403 # - RC file. 405 # - RC file.
404 # - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 406 # - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
405 sources = [ 407 sources = [
406 "app/shell_main.cc", 408 "app/shell_main.cc",
407 ] 409 ]
408 410
409 deps = [ 411 deps = [
410 ":content_shell_lib", 412 ":content_shell_lib",
411 ":pak", 413 ":pak",
412 "//base/allocator", 414 "//base/allocator",
415 "//build/win:default_exe_manifest",
413 ] 416 ]
414 417
415 if (is_win) { 418 if (is_win) {
416 deps += [ "//sandbox" ] 419 deps += [ "//sandbox" ]
417 if (!is_asan) { 420 if (!is_asan) {
418 configs -= [ "//build/config/win:console" ] 421 configs -= [ "//build/config/win:console" ]
419 configs += [ "//build/config/win:windowed" ] 422 configs += [ "//build/config/win:windowed" ]
420 } 423 }
421 } 424 }
422 425
(...skipping 27 matching lines...) Expand all
450 453
451 deps = [ 454 deps = [
452 "//base", 455 "//base",
453 "//components/crash/tools:crash_service", 456 "//components/crash/tools:crash_service",
454 ] 457 ]
455 458
456 configs -= [ "//build/config/win:console" ] 459 configs -= [ "//build/config/win:console" ]
457 configs += [ "//build/config/win:windowed" ] 460 configs += [ "//build/config/win:windowed" ]
458 } 461 }
459 } 462 }
OLDNEW
« no previous file with comments | « cloud_print/service/win/service.gyp ('k') | remoting/host/win/common-controls.manifest » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698