Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1249)

Side by Side Diff: chrome/test/BUILD.gn

Issue 1669793002: mac_views_browser: fixed interactive_ui_tests compilation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review fixes Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 if (mac_views_browser) {
tapted 2016/02/07 23:15:30 nit: comment before `The browser window can be vie
themblsha 2016/02/08 17:08:58 Done.
498 sources += rebase_path(
499 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma c_sources,
500 ".",
501 "//chrome")
502
503 # Aura depended tests.
504 sources -= [
505 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc",
506 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc",
507 ]
508 } else {
509 sources += rebase_path(
510 chrome_tests_gypi_values.chrome_interactive_ui_test_cocoa_source s,
511 ".",
512 "//chrome")
513 }
496 } 514 }
497 515
498 if (cld_version == 2) { 516 if (cld_version == 2) {
499 # Interactive tests should use whatever CLD2 data access mode that the 517 # Interactive tests should use whatever CLD2 data access mode that the
500 # application embedder is using. 518 # application embedder is using.
501 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 519 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
502 } 520 }
503 521
504 if (use_x11) { 522 if (use_x11) {
505 configs += [ "//build/config/linux:xtst" ] 523 configs += [ "//build/config/linux:xtst" ]
(...skipping 1683 matching lines...) Expand 10 before | Expand all | Expand 10 after
2189 if (is_android) { 2207 if (is_android) {
2190 android_library("unit_tests_java") { 2208 android_library("unit_tests_java") {
2191 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" 2209 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
2192 deps = [ 2210 deps = [
2193 "//base:base_java", 2211 "//base:base_java",
2194 "//chrome/android:chrome_java", 2212 "//chrome/android:chrome_java",
2195 "//content/public/android:content_java", 2213 "//content/public/android:content_java",
2196 ] 2214 ]
2197 } 2215 }
2198 } 2216 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698