| 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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 496 ldflags += [ "-Wl,-ObjC" ] | 496 ldflags += [ "-Wl,-ObjC" ] |
| 497 | 497 |
| 498 # The browser window can be views or Cocoa on Mac. Test accordingly. | 498 # The browser window can be views or Cocoa on Mac. Test accordingly. |
| 499 if (mac_views_browser) { | 499 if (mac_views_browser) { |
| 500 sources += rebase_path( | 500 sources += rebase_path( |
| 501 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma
c_sources, | 501 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma
c_sources, |
| 502 ".", | 502 ".", |
| 503 "//chrome") | 503 "//chrome") |
| 504 | 504 |
| 505 # Aura depended tests. | 505 # Aura depended tests. |
| 506 sources -= [ | 506 sources -= [ "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc" ] |
| 507 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", | |
| 508 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc", | |
| 509 ] | |
| 510 } else { | 507 } else { |
| 511 sources += rebase_path( | 508 sources += rebase_path( |
| 512 chrome_tests_gypi_values.chrome_interactive_ui_test_cocoa_source
s, | 509 chrome_tests_gypi_values.chrome_interactive_ui_test_cocoa_source
s, |
| 513 ".", | 510 ".", |
| 514 "//chrome") | 511 "//chrome") |
| 515 } | 512 } |
| 516 } | 513 } |
| 517 | 514 |
| 518 if (cld_version == 2) { | 515 if (cld_version == 2) { |
| 519 # Interactive tests should use whatever CLD2 data access mode that the | 516 # Interactive tests should use whatever CLD2 data access mode that the |
| (...skipping 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2285 if (is_android) { | 2282 if (is_android) { |
| 2286 android_library("unit_tests_java") { | 2283 android_library("unit_tests_java") { |
| 2287 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] | 2284 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] |
| 2288 deps = [ | 2285 deps = [ |
| 2289 "//base:base_java", | 2286 "//base:base_java", |
| 2290 "//chrome/android:chrome_java", | 2287 "//chrome/android:chrome_java", |
| 2291 "//content/public/android:content_java", | 2288 "//content/public/android:content_java", |
| 2292 ] | 2289 ] |
| 2293 } | 2290 } |
| 2294 } | 2291 } |
| OLD | NEW |