| 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 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 # The browser window can be views or Cocoa on Mac. Test accordingly. | 500 # The browser window can be views or Cocoa on Mac. Test accordingly. |
| 501 if (mac_views_browser) { | 501 if (mac_views_browser) { |
| 502 sources += rebase_path( | 502 sources += rebase_path( |
| 503 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma
c_sources, | 503 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma
c_sources, |
| 504 ".", | 504 ".", |
| 505 "//chrome") | 505 "//chrome") |
| 506 | 506 |
| 507 # Aura depended tests. | 507 # Aura depended tests. |
| 508 sources -= [ | 508 sources -= [ |
| 509 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", | 509 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", |
| 510 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc", | |
| 511 ] | 510 ] |
| 512 } else { | 511 } else { |
| 513 sources += rebase_path( | 512 sources += rebase_path( |
| 514 chrome_tests_gypi_values.chrome_interactive_ui_test_cocoa_source
s, | 513 chrome_tests_gypi_values.chrome_interactive_ui_test_cocoa_source
s, |
| 515 ".", | 514 ".", |
| 516 "//chrome") | 515 "//chrome") |
| 517 } | 516 } |
| 518 } | 517 } |
| 519 | 518 |
| 520 if (cld_version == 2) { | 519 if (cld_version == 2) { |
| (...skipping 1718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2239 if (is_android) { | 2238 if (is_android) { |
| 2240 android_library("unit_tests_java") { | 2239 android_library("unit_tests_java") { |
| 2241 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" | 2240 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" |
| 2242 deps = [ | 2241 deps = [ |
| 2243 "//base:base_java", | 2242 "//base:base_java", |
| 2244 "//chrome/android:chrome_java", | 2243 "//chrome/android:chrome_java", |
| 2245 "//content/public/android:content_java", | 2244 "//content/public/android:content_java", |
| 2246 ] | 2245 ] |
| 2247 } | 2246 } |
| 2248 } | 2247 } |
| OLD | NEW |