| 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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 } | 441 } |
| 442 } | 442 } |
| 443 } | 443 } |
| 444 if (is_chromeos || !use_x11) { | 444 if (is_chromeos || !use_x11) { |
| 445 sources -= [ | 445 sources -= [ |
| 446 "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_inter
active_uitest.cc", | 446 "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_inter
active_uitest.cc", |
| 447 "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interact
ive_uitest.cc", | 447 "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interact
ive_uitest.cc", |
| 448 ] | 448 ] |
| 449 } | 449 } |
| 450 if (use_aura) { | 450 if (use_aura) { |
| 451 # TODO(ekaramad): These tests are activated for aura only. They should |
| 452 # be moved to 'interactive_ui_tests' sources for all platforms once bug |
| 453 # 578168 is fixed. |
| 454 sources += [ "//chrome/browser/renderer_host/site_per_process_text_input
_browsertest.cc" ] |
| 451 deps += [ "//ui/touch_selection" ] | 455 deps += [ "//ui/touch_selection" ] |
| 452 } | 456 } |
| 453 } | 457 } |
| 454 | 458 |
| 455 if (!is_desktop_linux) { | 459 if (!is_desktop_linux) { |
| 456 # Everything but desktop Linux. | 460 # Everything but desktop Linux. |
| 457 sources += rebase_path( | 461 sources += rebase_path( |
| 458 chrome_tests_gypi_values.chrome_interactive_ui_test_non_desktop_li
nux_sources, | 462 chrome_tests_gypi_values.chrome_interactive_ui_test_non_desktop_li
nux_sources, |
| 459 ".", | 463 ".", |
| 460 "//chrome") | 464 "//chrome") |
| (...skipping 1922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2383 if (is_android) { | 2387 if (is_android) { |
| 2384 android_library("unit_tests_java") { | 2388 android_library("unit_tests_java") { |
| 2385 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] | 2389 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] |
| 2386 deps = [ | 2390 deps = [ |
| 2387 "//base:base_java", | 2391 "//base:base_java", |
| 2388 "//chrome/android:chrome_java", | 2392 "//chrome/android:chrome_java", |
| 2389 "//content/public/android:content_java", | 2393 "//content/public/android:content_java", |
| 2390 ] | 2394 ] |
| 2391 } | 2395 } |
| 2392 } | 2396 } |
| OLD | NEW |