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/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 | 7 |
8 gypi_values = exec_script( | 8 gypi_values = exec_script( |
9 "//build/gypi_to_gn.py", | 9 "//build/gypi_to_gn.py", |
10 [ rebase_path("views.gyp") ], | 10 [ rebase_path("views.gyp") ], |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 "test/ui_controls_factory_desktop_aurax11.h", | 136 "test/ui_controls_factory_desktop_aurax11.h", |
137 ] | 137 ] |
138 } | 138 } |
139 if (use_aura) { | 139 if (use_aura) { |
140 sources += gypi_values.views_test_support_aura_sources | 140 sources += gypi_values.views_test_support_aura_sources |
141 deps += [ "//ui/aura:test_support" ] | 141 deps += [ "//ui/aura:test_support" ] |
142 } | 142 } |
143 if (use_x11) { | 143 if (use_x11) { |
144 deps += [ "//ui/gfx/x" ] | 144 deps += [ "//ui/gfx/x" ] |
145 } | 145 } |
| 146 if (use_ozone) { |
| 147 sources -= [ |
| 148 "test/x11_property_change_waiter.cc", |
| 149 ] |
| 150 } |
146 } | 151 } |
147 | 152 |
148 test("views_unittests") { | 153 test("views_unittests") { |
149 sources = gypi_values.views_unittests_sources | 154 sources = gypi_values.views_unittests_sources |
150 | 155 |
151 deps = [ | 156 deps = [ |
152 ":test_support", | 157 ":test_support", |
153 "//base", | 158 "//base", |
154 "//base:i18n", | 159 "//base:i18n", |
155 "//base/allocator", | 160 "//base/allocator", |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 "//testing/gtest", | 262 "//testing/gtest", |
258 "//ui/aura", | 263 "//ui/aura", |
259 "//ui/compositor", | 264 "//ui/compositor", |
260 "//ui/resources", | 265 "//ui/resources", |
261 "//ui/resources:ui_test_pak", | 266 "//ui/resources:ui_test_pak", |
262 "//ui/strings", | 267 "//ui/strings", |
263 "//ui/wm", | 268 "//ui/wm", |
264 ] | 269 ] |
265 } | 270 } |
266 } | 271 } |
OLD | NEW |