| 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/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 "//ui/resources", | 778 "//ui/resources", |
| 779 ] | 779 ] |
| 780 | 780 |
| 781 configs -= [ "//build/config/win:default_incremental_linking" ] | 781 configs -= [ "//build/config/win:default_incremental_linking" ] |
| 782 configs += | 782 configs += |
| 783 [ "//build/config/win:default_large_module_incremental_linking" ] | 783 [ "//build/config/win:default_large_module_incremental_linking" ] |
| 784 | 784 |
| 785 libs = [ "oleacc.lib" ] | 785 libs = [ "oleacc.lib" ] |
| 786 } | 786 } |
| 787 | 787 |
| 788 if (toolkit_views && is_win) { | |
| 789 sources += [ "//ui/views/accessibility/ax_system_caret_win_interactive_uit
est.cc" ] | |
| 790 } | |
| 791 | |
| 792 if (is_mac) { | 788 if (is_mac) { |
| 793 data_deps += [ | 789 data_deps += [ |
| 794 "//chrome", | 790 "//chrome", |
| 795 "//chrome:chrome_framework", | 791 "//chrome:chrome_framework", |
| 796 ] | 792 ] |
| 797 | 793 |
| 798 # The browser window can be views or Cocoa on Mac. Test accordingly. | 794 # The browser window can be views or Cocoa on Mac. Test accordingly. |
| 799 if (mac_views_browser) { | 795 if (mac_views_browser) { |
| 800 # Aura depended tests. | 796 # Aura depended tests. |
| 801 sources -= [ "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc" ] | 797 sources -= [ "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc" ] |
| (...skipping 4396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5198 } | 5194 } |
| 5199 | 5195 |
| 5200 if (is_win) { | 5196 if (is_win) { |
| 5201 loadable_module("conflicts_dll") { | 5197 loadable_module("conflicts_dll") { |
| 5202 testonly = true | 5198 testonly = true |
| 5203 sources = [ | 5199 sources = [ |
| 5204 "conflicts/conflicts_dll.cc", | 5200 "conflicts/conflicts_dll.cc", |
| 5205 ] | 5201 ] |
| 5206 } | 5202 } |
| 5207 } | 5203 } |
| OLD | NEW |