Chromium Code Reviews| 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/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 import("//services/service_manager/public/cpp/service.gni") | 7 import("//services/service_manager/public/cpp/service.gni") |
| 8 import("//services/service_manager/public/service_manifest.gni") | 8 import("//services/service_manager/public/service_manifest.gni") |
| 9 | 9 |
| 10 static_library("lib") { | 10 static_library("lib") { |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 deps = [ | 195 deps = [ |
| 196 ":mus_ws_unittests", | 196 ":mus_ws_unittests", |
| 197 ] | 197 ] |
| 198 if (!is_android) { | 198 if (!is_android) { |
| 199 deps += [ "//services/ui/public/cpp/tests:mus_public_unittests" ] | 199 deps += [ "//services/ui/public/cpp/tests:mus_public_unittests" ] |
| 200 } | 200 } |
| 201 } | 201 } |
| 202 | 202 |
| 203 test("mus_ws_unittests") { | 203 test("mus_ws_unittests") { |
| 204 sources = [ | 204 sources = [ |
| 205 # TODO(fsamuel): Move this test with DisplayCompositor. crbug.com/670454 | |
| 206 "../surfaces/display_compositor_unittest.cc", | |
| 207 "cursor_unittest.cc", | 205 "cursor_unittest.cc", |
| 208 "display_unittest.cc", | 206 "display_unittest.cc", |
| 209 "drag_controller_unittest.cc", | 207 "drag_controller_unittest.cc", |
| 210 "event_dispatcher_unittest.cc", | 208 "event_dispatcher_unittest.cc", |
| 211 "event_matcher_unittest.cc", | 209 "event_matcher_unittest.cc", |
| 212 "focus_controller_unittest.cc", | 210 "focus_controller_unittest.cc", |
| 213 "frame_generator_unittest.cc", | 211 "frame_generator_unittest.cc", |
| 214 "server_window_compositor_frame_sink_manager_test_api.cc", | 212 "server_window_compositor_frame_sink_manager_test_api.cc", |
| 215 "server_window_compositor_frame_sink_manager_test_api.h", | 213 "server_window_compositor_frame_sink_manager_test_api.h", |
| 216 "server_window_drawn_tracker_unittest.cc", | 214 "server_window_drawn_tracker_unittest.cc", |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 253 "//ui/aura:test_support", | 251 "//ui/aura:test_support", |
| 254 "//ui/events", | 252 "//ui/events", |
| 255 "//ui/gfx", | 253 "//ui/gfx", |
| 256 "//ui/gfx:test_support", | 254 "//ui/gfx:test_support", |
| 257 "//ui/gfx/geometry", | 255 "//ui/gfx/geometry", |
| 258 "//ui/gfx/geometry/mojo", | 256 "//ui/gfx/geometry/mojo", |
| 259 "//ui/gl", | 257 "//ui/gl", |
| 260 ] | 258 ] |
| 261 | 259 |
| 262 # TODO(fsamuel): Remove this dep. crbug.com/670454 | 260 # TODO(fsamuel): Remove this dep. crbug.com/670454 |
| 263 deps += [ "//services/ui/surfaces" ] | 261 deps += [ "//services/ui/surfaces" ] |
|
kylechar
2017/01/17 16:15:36
You can remove this dep now too.
Saman Sami
2017/01/17 18:29:05
Done.
| |
| 264 | 262 |
| 265 data_deps = [ | 263 data_deps = [ |
| 266 ":mus_ws_unittests_app_manifest", | 264 ":mus_ws_unittests_app_manifest", |
| 267 ] | 265 ] |
| 268 } | 266 } |
| 269 | 267 |
| 270 service_manifest("mus_ws_unittests_app_manifest") { | 268 service_manifest("mus_ws_unittests_app_manifest") { |
| 271 name = "mus_ws_unittests_app" | 269 name = "mus_ws_unittests_app" |
| 272 source = "mus_ws_unittests_app_manifest.json" | 270 source = "mus_ws_unittests_app_manifest.json" |
| 273 } | 271 } |
| OLD | NEW |