| 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/catalog/public/tools/catalog.gni") | 7 import("//services/catalog/public/tools/catalog.gni") |
| 8 import("//services/service_manager/public/cpp/service.gni") | 8 import("//services/service_manager/public/cpp/service.gni") |
| 9 import("//services/service_manager/public/service_manifest.gni") | 9 import("//services/service_manager/public/service_manifest.gni") |
| 10 import("//services/service_manager/public/tools/test/service_test.gni") | 10 import("//services/service_manager/public/tools/test/service_test.gni") |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 "window_tree_client_unittest.cc", | 255 "window_tree_client_unittest.cc", |
| 256 "window_tree_unittest.cc", | 256 "window_tree_unittest.cc", |
| 257 ] | 257 ] |
| 258 | 258 |
| 259 if (!is_external_mode) { | 259 if (!is_external_mode) { |
| 260 # A window manager client is not needed on platforms running external | 260 # A window manager client is not needed on platforms running external |
| 261 # window mode, since the host system is always the window manager. | 261 # window mode, since the host system is always the window manager. |
| 262 sources += [ "window_manager_client_unittest.cc" ] | 262 sources += [ "window_manager_client_unittest.cc" ] |
| 263 } | 263 } |
| 264 | 264 |
| 265 # TODO(jamescook): Run this test on non-ozone platforms. This will require |
| 266 # initializing all the platform-specific windowing support. |
| 267 if (use_ozone) { |
| 268 sources += [ "platform_display_default_unittest.cc" ] |
| 269 } |
| 270 |
| 265 catalog = ":mus_ws_unittests_catalog" | 271 catalog = ":mus_ws_unittests_catalog" |
| 266 | 272 |
| 267 deps = [ | 273 deps = [ |
| 268 ":lib", | 274 ":lib", |
| 269 ":test_support", | 275 ":test_support", |
| 270 "//base", | 276 "//base", |
| 271 "//base/test:test_config", | 277 "//base/test:test_config", |
| 272 "//base/test:test_support", | 278 "//base/test:test_support", |
| 273 "//cc:cc", | 279 "//cc:cc", |
| 274 "//cc:test_support", | 280 "//cc:test_support", |
| (...skipping 23 matching lines...) Expand all Loading... |
| 298 service_manifest("mus_ws_unittests_app_manifest") { | 304 service_manifest("mus_ws_unittests_app_manifest") { |
| 299 name = "mus_ws_unittests_app" | 305 name = "mus_ws_unittests_app" |
| 300 source = "mus_ws_unittests_app_manifest.json" | 306 source = "mus_ws_unittests_app_manifest.json" |
| 301 } | 307 } |
| 302 | 308 |
| 303 catalog("mus_ws_unittests_catalog") { | 309 catalog("mus_ws_unittests_catalog") { |
| 304 embedded_services = [ ":mus_ws_unittests_app_manifest" ] | 310 embedded_services = [ ":mus_ws_unittests_app_manifest" ] |
| 305 | 311 |
| 306 standalone_services = [ "//services/ui:manifest" ] | 312 standalone_services = [ "//services/ui:manifest" ] |
| 307 } | 313 } |
| OLD | NEW |