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

Side by Side Diff: ui/compositor/BUILD.gn

Issue 2737513003: Fix compositor_unittests with Ozone X11. (Closed)
Patch Set: Group. Created 3 years, 9 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
« no previous file with comments | « no previous file | ui/compositor/test/DEPS » ('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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 component("compositor") { 8 component("compositor") {
9 sources = [ 9 sources = [
10 "callback_layer_animation_observer.cc", 10 "callback_layer_animation_observer.cc",
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 "//ui/gl:test_support", 158 "//ui/gl:test_support",
159 ] 159 ]
160 160
161 if (use_x11) { 161 if (use_x11) {
162 configs += [ "//build/config/linux:x11" ] 162 configs += [ "//build/config/linux:x11" ]
163 deps += [ "//ui/gfx/x" ] 163 deps += [ "//ui/gfx/x" ]
164 } 164 }
165 165
166 if (use_ozone) { 166 if (use_ozone) {
167 sources += [ "test/test_compositor_host_ozone.cc" ] 167 sources += [ "test/test_compositor_host_ozone.cc" ]
168
169 deps += [ "//ui/ozone" ]
168 } else if (use_x11) { 170 } else if (use_x11) {
169 sources += [ "test/test_compositor_host_x11.cc" ] 171 sources += [ "test/test_compositor_host_x11.cc" ]
170 } 172 }
171 } 173 }
172 174
173 test("compositor_unittests") { 175 test("compositor_unittests") {
174 sources = [ 176 sources = [
175 "callback_layer_animation_observer_unittest.cc", 177 "callback_layer_animation_observer_unittest.cc",
176 "compositor_unittest.cc", 178 "compositor_unittest.cc",
177 "layer_animation_element_unittest.cc", 179 "layer_animation_element_unittest.cc",
(...skipping 24 matching lines...) Expand all
202 "//ui/base", 204 "//ui/base",
203 "//ui/gfx", 205 "//ui/gfx",
204 "//ui/gfx/geometry", 206 "//ui/gfx/geometry",
205 "//ui/gl", 207 "//ui/gl",
206 "//ui/resources", 208 "//ui/resources",
207 ] 209 ]
208 if (is_linux) { 210 if (is_linux) {
209 deps += [ "//third_party/mesa:osmesa" ] 211 deps += [ "//third_party/mesa:osmesa" ]
210 } 212 }
211 } 213 }
OLDNEW
« no previous file with comments | « no previous file | ui/compositor/test/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698