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

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

Issue 2514413002: Clean up GTK3 build flags. (Closed)
Patch Set: Fixes 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
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 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 if (!is_chromeos) { 583 if (!is_chromeos) {
584 # Desktop linux. 584 # Desktop linux.
585 sources -= [ 585 sources -= [
586 # TODO(port): This times out. Attempts have been made to fix the 586 # TODO(port): This times out. Attempts have been made to fix the
587 # individual failures, but each time I disable a test from these 587 # individual failures, but each time I disable a test from these
588 # suites, it seems like one or another starts timing out too. 588 # suites, it seems like one or another starts timing out too.
589 "../browser/ui/views/keyboard_access_browsertest.cc", 589 "../browser/ui/views/keyboard_access_browsertest.cc",
590 ] 590 ]
591 if (!use_ozone) { 591 if (!use_ozone) {
592 sources += [ "../browser/ui/libgtkui/select_file_dialog_interactive_ uitest.cc" ] 592 sources += [ "../browser/ui/libgtkui/select_file_dialog_interactive_ uitest.cc" ]
593 if (use_gtk3) { 593 deps += [ "//build/config/linux/gtk" ]
594 configs += [ "//build/config/linux/gtk3:gtk3_internal_config" ]
595 } else {
596 configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ]
597 }
598 } 594 }
599 } 595 }
600 } 596 }
601 if (is_chromeos || !use_x11) { 597 if (is_chromeos || !use_x11) {
602 sources -= [ 598 sources -= [
603 "//ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interacti ve_uitest.cc", 599 "//ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interacti ve_uitest.cc",
604 "//ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_ uitest.cc", 600 "//ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_ uitest.cc",
605 ] 601 ]
606 } 602 }
607 if (use_aura) { 603 if (use_aura) {
(...skipping 3520 matching lines...) Expand 10 before | Expand all | Expand 10 after
4128 "//chrome/browser/profiles/profile_statistics_unittest.cc", 4124 "//chrome/browser/profiles/profile_statistics_unittest.cc",
4129 "//chrome/browser/ui/startup/default_browser_infobar_delegate_unittest.cc" , 4125 "//chrome/browser/ui/startup/default_browser_infobar_delegate_unittest.cc" ,
4130 "//chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc", 4126 "//chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc",
4131 "//chrome/browser/ui/startup/startup_tab_provider_unittest.cc", 4127 "//chrome/browser/ui/startup/startup_tab_provider_unittest.cc",
4132 ] 4128 ]
4133 } 4129 }
4134 if (use_gio) { 4130 if (use_gio) {
4135 deps += [ "//build/linux/libgio" ] 4131 deps += [ "//build/linux/libgio" ]
4136 } 4132 }
4137 if (!is_chromeos && !use_ozone && is_linux) { 4133 if (!is_chromeos && !use_ozone && is_linux) {
4138 if (use_gtk3) { 4134 deps += [ "//chrome/browser/ui/libgtkui" ]
4139 deps += [ "//chrome/browser/ui/libgtkui:libgtk3ui" ]
4140 } else {
4141 deps += [ "//chrome/browser/ui/libgtkui:libgtk2ui" ]
4142 }
4143 } 4135 }
4144 4136
4145 if (enable_task_manager) { 4137 if (enable_task_manager) {
4146 sources += [ 4138 sources += [
4147 "../browser/task_manager/providers/browser_process_task_unittest.cc", 4139 "../browser/task_manager/providers/browser_process_task_unittest.cc",
4148 "../browser/task_manager/providers/child_process_task_unittest.cc", 4140 "../browser/task_manager/providers/child_process_task_unittest.cc",
4149 "../browser/task_manager/sampling/shared_sampler_unittest_win.cc", 4141 "../browser/task_manager/sampling/shared_sampler_unittest_win.cc",
4150 "../browser/task_manager/sampling/task_manager_impl_unittest.cc", 4142 "../browser/task_manager/sampling/task_manager_impl_unittest.cc",
4151 "../browser/task_manager/task_manager_observer_unittest.cc", 4143 "../browser/task_manager/task_manager_observer_unittest.cc",
4152 "../browser/task_manager/test_task_manager.cc", 4144 "../browser/task_manager/test_task_manager.cc",
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
5100 "touch_hud", 5092 "touch_hud",
5101 "ui", 5093 "ui",
5102 ] 5094 ]
5103 5095
5104 if (is_linux && !is_android) { 5096 if (is_linux && !is_android) {
5105 deps += [ "//components/font_service:manifest" ] 5097 deps += [ "//components/font_service:manifest" ]
5106 packaged_services += [ "font_service" ] 5098 packaged_services += [ "font_service" ]
5107 } 5099 }
5108 } 5100 }
5109 } 5101 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698