| 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("//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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 } | 282 } |
| 283 | 283 |
| 284 if (is_linux) { | 284 if (is_linux) { |
| 285 configs += [ "//build/config/linux:fontconfig" ] | 285 configs += [ "//build/config/linux:fontconfig" ] |
| 286 } | 286 } |
| 287 | 287 |
| 288 if (use_x11) { | 288 if (use_x11) { |
| 289 # Some tests rely on this tool at runtime. Note: it might be better if | 289 # Some tests rely on this tool at runtime. Note: it might be better if |
| 290 # the tests that needed it had this as a dep instead of adding it here. | 290 # the tests that needed it had this as a dep instead of adding it here. |
| 291 datadeps = [ "//tools/xdisplaycheck" ] | 291 datadeps = [ "//tools/xdisplaycheck" ] |
| 292 |
| 293 deps += [ "//ui/events/devices" ] |
| 292 } | 294 } |
| 293 | 295 |
| 294 if (is_android) { | 296 if (is_android) { |
| 295 deps += [ "//content/shell/android:content_shell_jni_headers" ] | 297 deps += [ "//content/shell/android:content_shell_jni_headers" ] |
| 296 #deps -= [ "copy_test_netscape_plugin" ] TODO(GYP) | 298 #deps -= [ "copy_test_netscape_plugin" ] TODO(GYP) |
| 297 } | 299 } |
| 298 | 300 |
| 299 if (is_posix && !is_mac && (!is_android || !is_android_webview_build)) { | 301 if (is_posix && !is_mac && (!is_android || !is_android_webview_build)) { |
| 300 deps += [ "//components/crash/browser" ] | 302 deps += [ "//components/crash/browser" ] |
| 301 } | 303 } |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 if (is_android && !is_android_webview_build) { | 496 if (is_android && !is_android_webview_build) { |
| 495 # Some tests rely on this tool. It might be nicer if these tests relied on | 497 # Some tests rely on this tool. It might be nicer if these tests relied on |
| 496 # image diff rather than having content shell depend on it. | 498 # image diff rather than having content shell depend on it. |
| 497 datadeps = [ | 499 datadeps = [ |
| 498 "//tools/imagediff($host_toolchain)", | 500 "//tools/imagediff($host_toolchain)", |
| 499 ] | 501 ] |
| 500 } | 502 } |
| 501 } | 503 } |
| 502 | 504 |
| 503 } | 505 } |
| OLD | NEW |