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

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

Issue 1335313003: Replace instances of datadeps --> data_deps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make formatter recognize both datadeps and data_deps Created 5 years, 3 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 | « no previous file | third_party/widevine/cdm/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("//build/config/win/manifest.gni") 7 import("//build/config/win/manifest.gni")
8 import("//tools/grit/repack.gni") 8 import("//tools/grit/repack.gni")
9 import("//tools/grit/grit_rule.gni") 9 import("//tools/grit/grit_rule.gni")
10 if (is_android) { 10 if (is_android) {
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 ] 253 ]
254 } 254 }
255 255
256 if (is_linux) { 256 if (is_linux) {
257 configs += [ "//build/config/linux:fontconfig" ] 257 configs += [ "//build/config/linux:fontconfig" ]
258 } 258 }
259 259
260 if (use_x11) { 260 if (use_x11) {
261 # Some tests rely on this tool at runtime. Note: it might be better if 261 # Some tests rely on this tool at runtime. Note: it might be better if
262 # the tests that needed it had this as a dep instead of adding it here. 262 # the tests that needed it had this as a dep instead of adding it here.
263 datadeps = [ 263 data_deps = [ "//tools/xdisplaycheck" ]
264 "//tools/xdisplaycheck",
265 ]
266 264
267 deps += [ "//ui/events/devices" ] 265 deps += [ "//ui/events/devices" ]
268 } 266 }
269 267
270 if (is_android) { 268 if (is_android) {
271 deps += [ "//content/shell/android:content_shell_jni_headers" ] 269 deps += [ "//content/shell/android:content_shell_jni_headers" ]
272 #deps -= [ "copy_test_netscape_plugin" ] TODO(GYP) 270 #deps -= [ "copy_test_netscape_plugin" ] TODO(GYP)
273 } 271 }
274 272
275 if (is_posix && !is_mac) { 273 if (is_posix && !is_mac) {
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 } 428 }
431 } 429 }
432 430
433 if (is_mac) { 431 if (is_mac) {
434 # TODO(GYP) lots of stuff from GYP file here. 432 # TODO(GYP) lots of stuff from GYP file here.
435 } 433 }
436 434
437 if (is_android) { 435 if (is_android) {
438 # Some tests rely on this tool. It might be nicer if these tests relied on 436 # Some tests rely on this tool. It might be nicer if these tests relied on
439 # image diff rather than having content shell depend on it. 437 # image diff rather than having content shell depend on it.
440 datadeps = [ 438 data_deps = [ "//tools/imagediff($host_toolchain)" ]
441 "//tools/imagediff($host_toolchain)",
442 ]
443 } 439 }
444 } 440 }
445 } else { 441 } else {
446 group("content_shell") { 442 group("content_shell") {
447 testonly = true 443 testonly = true
448 deps = [ 444 deps = [
449 ":content_shell_lib", 445 ":content_shell_lib",
450 ] 446 ]
451 } 447 }
452 } 448 }
453 449
454 if (is_win) { 450 if (is_win) {
455 # GYP version: content/content_shell_and_tests.gyp:content_shell_crash_service 451 # GYP version: content/content_shell_and_tests.gyp:content_shell_crash_service
456 executable("crash_service") { 452 executable("crash_service") {
457 sources = [ 453 sources = [
458 "tools/content_shell_crash_service.cc", 454 "tools/content_shell_crash_service.cc",
459 ] 455 ]
460 456
461 deps = [ 457 deps = [
462 "//base", 458 "//base",
463 "//build/config/sanitizers:deps", 459 "//build/config/sanitizers:deps",
464 "//components/crash/tools:crash_service", 460 "//components/crash/tools:crash_service",
465 ] 461 ]
466 462
467 configs -= [ "//build/config/win:console" ] 463 configs -= [ "//build/config/win:console" ]
468 configs += [ "//build/config/win:windowed" ] 464 configs += [ "//build/config/win:windowed" ]
469 } 465 }
470 } 466 }
OLDNEW
« no previous file with comments | « no previous file | third_party/widevine/cdm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698