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

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

Issue 2530463002: Remove xdisplaycheck from the tree (Closed)
Patch Set: Rebase again Created 4 years 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
« no previous file with comments | « blimp/BUILD.gn ('k') | components/exo/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/features.gni") 10 import("//chrome/common/features.gni")
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 sources += [ 739 sources += [
740 "../browser/ui/cocoa/extensions/browser_action_button_interactive_uite st.mm", 740 "../browser/ui/cocoa/extensions/browser_action_button_interactive_uite st.mm",
741 "../browser/ui/cocoa/translate/translate_bubble_test_utils_cocoa.mm", 741 "../browser/ui/cocoa/translate/translate_bubble_test_utils_cocoa.mm",
742 "base/interactive_test_utils_cocoa.mm", 742 "base/interactive_test_utils_cocoa.mm",
743 ] 743 ]
744 } 744 }
745 } 745 }
746 746
747 if (use_x11) { 747 if (use_x11) {
748 configs += [ "//build/config/linux:xtst" ] 748 configs += [ "//build/config/linux:xtst" ]
749 data_deps += [ "//tools/xdisplaycheck" ]
750 } 749 }
751 750
752 if (enable_app_list) { 751 if (enable_app_list) {
753 sources += 752 sources +=
754 [ "../browser/ui/app_list/app_list_service_interactive_uitest.cc" ] 753 [ "../browser/ui/app_list/app_list_service_interactive_uitest.cc" ]
755 } 754 }
756 755
757 if (!use_aura) { 756 if (!use_aura) {
758 sources -= [ 757 sources -= [
759 "base/interactive_test_utils_aura.cc", 758 "base/interactive_test_utils_aura.cc",
(...skipping 1916 matching lines...) Expand 10 before | Expand all | Expand 10 after
2676 "remoting/remote_test_helper.cc", 2675 "remoting/remote_test_helper.cc",
2677 "remoting/remote_test_helper.h", 2676 "remoting/remote_test_helper.h",
2678 "remoting/scrollbar_browsertest.cc", 2677 "remoting/scrollbar_browsertest.cc",
2679 "remoting/unauthenticated_browsertest.cc", 2678 "remoting/unauthenticated_browsertest.cc",
2680 "remoting/waiter.cc", 2679 "remoting/waiter.cc",
2681 "remoting/waiter.h", 2680 "remoting/waiter.h",
2682 "remoting/webapp_javascript_browsertest.cc", 2681 "remoting/webapp_javascript_browsertest.cc",
2683 ] 2682 ]
2684 deps += [ "//remoting/webapp" ] 2683 deps += [ "//remoting/webapp" ]
2685 } 2684 }
2686 if (use_x11) {
2687 deps += [ "//tools/xdisplaycheck" ]
2688 }
2689 2685
2690 if (use_aura) { 2686 if (use_aura) {
2691 if (enable_wifi_display) { 2687 if (enable_wifi_display) {
2692 sources += [ 2688 sources += [
2693 "../../extensions/browser/api/display_source/display_source_apitestbas e.cc", 2689 "../../extensions/browser/api/display_source/display_source_apitestbas e.cc",
2694 "../../extensions/browser/api/display_source/display_source_apitestbas e.h", 2690 "../../extensions/browser/api/display_source/display_source_apitestbas e.h",
2695 "../browser/extensions/api/display_source/display_source_wifi_display_ apitest.cc", 2691 "../browser/extensions/api/display_source/display_source_wifi_display_ apitest.cc",
2696 ] 2692 ]
2697 } 2693 }
2698 } 2694 }
(...skipping 1733 matching lines...) Expand 10 before | Expand all | Expand 10 after
4432 "../browser/policy/cloud/user_policy_signin_service_unittest.cc", 4428 "../browser/policy/cloud/user_policy_signin_service_unittest.cc",
4433 "../browser/signin/signin_manager_unittest.cc", 4429 "../browser/signin/signin_manager_unittest.cc",
4434 ] 4430 ]
4435 sources += [ 4431 sources += [
4436 "base/ash_test_environment_chrome.cc", 4432 "base/ash_test_environment_chrome.cc",
4437 "base/ash_test_environment_chrome.h", 4433 "base/ash_test_environment_chrome.h",
4438 ] 4434 ]
4439 } 4435 }
4440 if (use_x11) { 4436 if (use_x11) {
4441 deps += [ "//ui/events/devices" ] 4437 deps += [ "//ui/events/devices" ]
4442 data_deps += [ "//tools/xdisplaycheck" ]
4443 } else { 4438 } else {
4444 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] 4439 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
4445 } 4440 }
4446 if (use_gnome_keyring && current_cpu == "x64") { 4441 if (use_gnome_keyring && current_cpu == "x64") {
4447 # Only add this test for 64 bit builds because otherwise we need the 32 4442 # Only add this test for 64 bit builds because otherwise we need the 32
4448 # bit library on 64 bit systems when running this test. 4443 # bit library on 64 bit systems when running this test.
4449 sources += 4444 sources +=
4450 [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ] 4445 [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ]
4451 configs += [ 4446 configs += [
4452 "//components/os_crypt:gnome_keyring", 4447 "//components/os_crypt:gnome_keyring",
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
5150 } 5145 }
5151 5146
5152 if (is_win) { 5147 if (is_win) {
5153 loadable_module("conflicts_dll") { 5148 loadable_module("conflicts_dll") {
5154 testonly = true 5149 testonly = true
5155 sources = [ 5150 sources = [
5156 "conflicts/conflicts_dll.cc", 5151 "conflicts/conflicts_dll.cc",
5157 ] 5152 ]
5158 } 5153 }
5159 } 5154 }
OLDNEW
« no previous file with comments | « blimp/BUILD.gn ('k') | components/exo/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698