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 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 libs = [ "oleacc.lib" ] | 486 libs = [ "oleacc.lib" ] |
487 } | 487 } |
488 | 488 |
489 if (is_mac) { | 489 if (is_mac) { |
490 data_deps += [ "//chrome" ] | 490 data_deps += [ "//chrome" ] |
491 | 491 |
492 # TODO(mark): We really want this for all non-static library targets, but | 492 # TODO(mark): We really want this for all non-static library targets, but |
493 # when we tried to pull it up to the common.gypi level, it broke other | 493 # when we tried to pull it up to the common.gypi level, it broke other |
494 # things like the ui and startup tests. *shrug* | 494 # things like the ui and startup tests. *shrug* |
495 ldflags += [ "-Wl,-ObjC" ] | 495 ldflags += [ "-Wl,-ObjC" ] |
| 496 |
| 497 # The browser window can be views or Cocoa on Mac. Test accordingly. |
| 498 if (mac_views_browser) { |
| 499 sources += rebase_path( |
| 500 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma
c_sources, |
| 501 ".", |
| 502 "//chrome") |
| 503 |
| 504 # Aura depended tests. |
| 505 sources -= [ |
| 506 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", |
| 507 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc", |
| 508 ] |
| 509 } else { |
| 510 sources += rebase_path( |
| 511 chrome_tests_gypi_values.chrome_interactive_ui_test_cocoa_source
s, |
| 512 ".", |
| 513 "//chrome") |
| 514 } |
496 } | 515 } |
497 | 516 |
498 if (cld_version == 2) { | 517 if (cld_version == 2) { |
499 # Interactive tests should use whatever CLD2 data access mode that the | 518 # Interactive tests should use whatever CLD2 data access mode that the |
500 # application embedder is using. | 519 # application embedder is using. |
501 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 520 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
502 } | 521 } |
503 | 522 |
504 if (use_x11) { | 523 if (use_x11) { |
505 configs += [ "//build/config/linux:xtst" ] | 524 configs += [ "//build/config/linux:xtst" ] |
(...skipping 1698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2204 if (is_android) { | 2223 if (is_android) { |
2205 android_library("unit_tests_java") { | 2224 android_library("unit_tests_java") { |
2206 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" | 2225 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" |
2207 deps = [ | 2226 deps = [ |
2208 "//base:base_java", | 2227 "//base:base_java", |
2209 "//chrome/android:chrome_java", | 2228 "//chrome/android:chrome_java", |
2210 "//content/public/android:content_java", | 2229 "//content/public/android:content_java", |
2211 ] | 2230 ] |
2212 } | 2231 } |
2213 } | 2232 } |
OLD | NEW |