| 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") |  | 
| 8 import("//tools/grit/repack.gni") | 7 import("//tools/grit/repack.gni") | 
| 9 import("//tools/grit/grit_rule.gni") | 8 import("//tools/grit/grit_rule.gni") | 
| 10 if (is_android) { | 9 if (is_android) { | 
| 11   import("//build/config/android/config.gni") | 10   import("//build/config/android/config.gni") | 
| 12 } | 11 } | 
| 13 | 12 | 
| 14 declare_args() { | 13 declare_args() { | 
| 15   content_shell_product_name = "Content Shell" | 14   content_shell_product_name = "Content Shell" | 
| 16 | 15 | 
| 17   # The "19" is so that sites that sniff for version think that this is | 16   # 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  Loading... | 
| 388   } | 387   } | 
| 389 | 388 | 
| 390   sources += [ "$root_gen_dir/blink/devtools_resources.pak" ] | 389   sources += [ "$root_gen_dir/blink/devtools_resources.pak" ] | 
| 391   deps += [ "//content/browser/devtools:resources" ] | 390   deps += [ "//content/browser/devtools:resources" ] | 
| 392   output = "$root_out_dir/content_shell.pak" | 391   output = "$root_out_dir/content_shell.pak" | 
| 393 } | 392 } | 
| 394 | 393 | 
| 395 # TODO(GYP): Figure out what this should be on android | 394 # TODO(GYP): Figure out what this should be on android | 
| 396 # and make linking this work on the Mac. | 395 # and make linking this work on the Mac. | 
| 397 if (!is_android && !is_mac) { | 396 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. |  | 
| 400   executable("content_shell") { | 397   executable("content_shell") { | 
| 401     testonly = true | 398     testonly = true | 
| 402 | 399 | 
| 403     # TODO(GYP) mac resource bundle stuff for this target. | 400     # TODO(GYP) mac resource bundle stuff for this target. | 
| 404     # TODO(GYP) Windows content shell settings: | 401     # TODO(GYP) Windows content shell settings: | 
|  | 402     #  - Manifest. | 
| 405     #  - RC file. | 403     #  - RC file. | 
| 406     #  - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 404     #  - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 
| 407     sources = [ | 405     sources = [ | 
| 408       "app/shell_main.cc", | 406       "app/shell_main.cc", | 
| 409     ] | 407     ] | 
| 410 | 408 | 
| 411     deps = [ | 409     deps = [ | 
| 412       ":content_shell_lib", | 410       ":content_shell_lib", | 
| 413       ":pak", | 411       ":pak", | 
| 414       "//base/allocator", | 412       "//base/allocator", | 
| 415       "//build/win:default_exe_manifest", |  | 
| 416     ] | 413     ] | 
| 417 | 414 | 
| 418     if (is_win) { | 415     if (is_win) { | 
| 419       deps += [ "//sandbox" ] | 416       deps += [ "//sandbox" ] | 
| 420       if (!is_asan) { | 417       if (!is_asan) { | 
| 421         configs -= [ "//build/config/win:console" ] | 418         configs -= [ "//build/config/win:console" ] | 
| 422         configs += [ "//build/config/win:windowed" ] | 419         configs += [ "//build/config/win:windowed" ] | 
| 423       } | 420       } | 
| 424     } | 421     } | 
| 425 | 422 | 
| (...skipping 27 matching lines...) Expand all  Loading... | 
| 453 | 450 | 
| 454     deps = [ | 451     deps = [ | 
| 455       "//base", | 452       "//base", | 
| 456       "//components/crash/tools:crash_service", | 453       "//components/crash/tools:crash_service", | 
| 457     ] | 454     ] | 
| 458 | 455 | 
| 459     configs -= [ "//build/config/win:console" ] | 456     configs -= [ "//build/config/win:console" ] | 
| 460     configs += [ "//build/config/win:windowed" ] | 457     configs += [ "//build/config/win:windowed" ] | 
| 461   } | 458   } | 
| 462 } | 459 } | 
| OLD | NEW | 
|---|