| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/chrome_tests.gni") | 10 import("//chrome/chrome_tests.gni") |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ] | 392 sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ] |
| 393 | 393 |
| 394 if (!is_chromeos) { | 394 if (!is_chromeos) { |
| 395 # Desktop linux. | 395 # Desktop linux. |
| 396 sources -= [ | 396 sources -= [ |
| 397 # TODO(port): This times out. Attempts have been made to fix the | 397 # TODO(port): This times out. Attempts have been made to fix the |
| 398 # individual failures, but each time I disable a test from these | 398 # individual failures, but each time I disable a test from these |
| 399 # suites, it seems like one or another starts timing out too. | 399 # suites, it seems like one or another starts timing out too. |
| 400 "../browser/ui/views/keyboard_access_browsertest.cc", | 400 "../browser/ui/views/keyboard_access_browsertest.cc", |
| 401 ] | 401 ] |
| 402 sources += |
| 403 [ "../browser/ui/libgtk2ui/select_file_dialog_impl_test.cc" ] |
| 404 configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ] |
| 402 } | 405 } |
| 403 } | 406 } |
| 404 if (is_chromeos || !use_x11) { | 407 if (is_chromeos || !use_x11) { |
| 405 sources -= [ | 408 sources -= [ |
| 406 "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_inter
active_uitest.cc", | 409 "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_inter
active_uitest.cc", |
| 407 "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interact
ive_uitest.cc", | 410 "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interact
ive_uitest.cc", |
| 408 ] | 411 ] |
| 409 } | 412 } |
| 410 if (use_aura) { | 413 if (use_aura) { |
| 411 deps += [ "//ui/touch_selection" ] | 414 deps += [ "//ui/touch_selection" ] |
| (...skipping 1801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2213 | 2216 |
| 2214 android_library("unit_tests_java") { | 2217 android_library("unit_tests_java") { |
| 2215 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" | 2218 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" |
| 2216 deps = [ | 2219 deps = [ |
| 2217 "//base:base_java", | 2220 "//base:base_java", |
| 2218 "//chrome/android:chrome_java", | 2221 "//chrome/android:chrome_java", |
| 2219 "//content/public/android:content_java", | 2222 "//content/public/android:content_java", |
| 2220 ] | 2223 ] |
| 2221 } | 2224 } |
| 2222 } | 2225 } |
| OLD | NEW |