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