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/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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 144 "//ui/gfx/geometry/mojo", | 144 "//ui/gfx/geometry/mojo", |
| 145 "//ui/gl", | 145 "//ui/gl", |
| 146 "//ui/platform_window", | 146 "//ui/platform_window", |
| 147 "//ui/platform_window:platform_impls", | 147 "//ui/platform_window:platform_impls", |
| 148 "//ui/platform_window/mojo", | 148 "//ui/platform_window/mojo", |
| 149 ] | 149 ] |
| 150 | 150 |
| 151 if (use_ozone) { | 151 if (use_ozone) { |
| 152 public_deps += [ "//ui/ozone:ozone" ] | 152 public_deps += [ "//ui/ozone:ozone" ] |
| 153 } | 153 } |
| 154 if (is_chromeos) { | |
| 155 public_deps += [ "//ui/chromeos/events" ] | |
|
sky
2017/03/15 19:48:11
I was concerned about what this pulls in, and don'
Peng
2017/03/16 17:28:57
It will be added by CL https://codereview.chromium
| |
| 156 } | |
| 154 } | 157 } |
| 155 | 158 |
| 156 static_library("test_interface") { | 159 static_library("test_interface") { |
| 157 sources = [ | 160 sources = [ |
| 158 "window_server_test_impl.cc", | 161 "window_server_test_impl.cc", |
| 159 "window_server_test_impl.h", | 162 "window_server_test_impl.h", |
| 160 ] | 163 ] |
| 161 | 164 |
| 162 deps = [ | 165 deps = [ |
| 163 ":lib", | 166 ":lib", |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 280 service_manifest("mus_ws_unittests_app_manifest") { | 283 service_manifest("mus_ws_unittests_app_manifest") { |
| 281 name = "mus_ws_unittests_app" | 284 name = "mus_ws_unittests_app" |
| 282 source = "mus_ws_unittests_app_manifest.json" | 285 source = "mus_ws_unittests_app_manifest.json" |
| 283 } | 286 } |
| 284 | 287 |
| 285 catalog("mus_ws_unittests_catalog") { | 288 catalog("mus_ws_unittests_catalog") { |
| 286 embedded_services = [ ":mus_ws_unittests_app_manifest" ] | 289 embedded_services = [ ":mus_ws_unittests_app_manifest" ] |
| 287 | 290 |
| 288 standalone_services = [ "//services/ui:manifest" ] | 291 standalone_services = [ "//services/ui:manifest" ] |
| 289 } | 292 } |
| OLD | NEW |