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

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

Issue 886243002: Revert "Fix chrome target in Windows GN build." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « components/invalidation/BUILD.gn ('k') | content/test/BUILD.gn » ('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("//tools/grit/repack.gni") 7 import("//tools/grit/repack.gni")
8 import("//tools/grit/grit_rule.gni") 8 import("//tools/grit/grit_rule.gni")
9 if (is_android) { 9 if (is_android) {
10 import("//build/config/android/config.gni") 10 import("//build/config/android/config.gni")
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 ] 271 ]
272 if (enable_plugins) { 272 if (enable_plugins) {
273 deps += [ "//content/ppapi_plugin" ] 273 deps += [ "//content/ppapi_plugin" ]
274 } 274 }
275 275
276 if (is_win) { 276 if (is_win) {
277 #'LinkIncremental': '<(msvs_large_module_debug_link_mode)', TODO(GYP) 277 #'LinkIncremental': '<(msvs_large_module_debug_link_mode)', TODO(GYP)
278 278
279 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 279 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
280 cflags = [ "/wd4267" ] 280 cflags = [ "/wd4267" ]
281 sources += [
282 "common/v8_breakpad_support_win.cc",
283 "common/v8_breakpad_support_win.h",
284 ]
285 } 281 }
286 282
287 if (is_linux) { 283 if (is_linux) {
288 configs += [ "//build/config/linux:fontconfig" ] 284 configs += [ "//build/config/linux:fontconfig" ]
289 } 285 }
290 286
291 if (use_x11) { 287 if (use_x11) {
292 # Some tests rely on this tool at runtime. Note: it might be better if 288 # Some tests rely on this tool at runtime. Note: it might be better if
293 # the tests that needed it had this as a dep instead of adding it here. 289 # the tests that needed it had this as a dep instead of adding it here.
294 datadeps = [ 290 datadeps = [
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 if (!is_android && !is_mac) { 480 if (!is_android && !is_mac) {
485 executable("content_shell") { 481 executable("content_shell") {
486 testonly = true 482 testonly = true
487 483
488 # TODO(GYP) mac resource bundle stuff for this target. 484 # TODO(GYP) mac resource bundle stuff for this target.
489 # TODO(GYP) Windows content shell settings: 485 # TODO(GYP) Windows content shell settings:
490 # - Manifest. 486 # - Manifest.
491 # - RC file. 487 # - RC file.
492 # - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 488 # - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
493 sources = [ 489 sources = [
490 "../app/startup_helper_win.cc",
494 "app/shell_main.cc", 491 "app/shell_main.cc",
495 ] 492 ]
496 493
497 deps = [ 494 deps = [
498 ":content_shell_lib", 495 ":content_shell_lib",
499 ":pak", 496 ":pak",
500 "//base/allocator", 497 "//base/allocator",
501 ] 498 ]
502 499
503 if (is_win) { 500 if (is_win) {
(...skipping 10 matching lines...) Expand all
514 511
515 if (is_android && !is_android_webview_build) { 512 if (is_android && !is_android_webview_build) {
516 # Some tests rely on this tool. It might be nicer if these tests relied on 513 # Some tests rely on this tool. It might be nicer if these tests relied on
517 # image diff rather than having content shell depend on it. 514 # image diff rather than having content shell depend on it.
518 datadeps = [ 515 datadeps = [
519 "//tools/imagediff($host_toolchain)", 516 "//tools/imagediff($host_toolchain)",
520 ] 517 ]
521 } 518 }
522 } 519 }
523 } 520 }
OLDNEW
« no previous file with comments | « components/invalidation/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698