| 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("//services/shell/public/service_manifest.gni") | 5 import("//services/service_manager/public/service_manifest.gni") |
| 6 import("//mojo/public/tools/bindings/mojom.gni") | 6 import("//mojo/public/tools/bindings/mojom.gni") |
| 7 import("//testing/test.gni") | 7 import("//testing/test.gni") |
| 8 | 8 |
| 9 group("all") { | 9 group("all") { |
| 10 testonly = true | 10 testonly = true |
| 11 deps = [ | 11 deps = [ |
| 12 ":shell", | 12 ":service_manager", |
| 13 "//services/shell/background", | 13 "//services/service_manager/background", |
| 14 "//services/shell/runner", | 14 "//services/service_manager/runner", |
| 15 "//services/shell/standalone", | 15 "//services/service_manager/standalone", |
| 16 "//services/shell/tests", | 16 "//services/service_manager/tests", |
| 17 ] | 17 ] |
| 18 } | 18 } |
| 19 | 19 |
| 20 source_set("shell") { | 20 source_set("service_manager") { |
| 21 output_name = "mojo_shell" | |
| 22 sources = [ | 21 sources = [ |
| 23 "connect_params.cc", | 22 "connect_params.cc", |
| 24 "connect_params.h", | 23 "connect_params.h", |
| 25 "connect_util.cc", | 24 "connect_util.cc", |
| 26 "connect_util.h", | 25 "connect_util.h", |
| 27 "native_runner.h", | 26 "native_runner.h", |
| 28 "native_runner_delegate.h", | 27 "native_runner_delegate.h", |
| 29 "service_manager.cc", | 28 "service_manager.cc", |
| 30 "service_manager.h", | 29 "service_manager.h", |
| 31 "service_overrides.cc", | 30 "service_overrides.cc", |
| 32 "service_overrides.h", | 31 "service_overrides.h", |
| 33 "switches.cc", | 32 "switches.cc", |
| 34 "switches.h", | 33 "switches.h", |
| 35 ] | 34 ] |
| 36 | 35 |
| 37 deps = [ | 36 deps = [ |
| 38 "//base", | 37 "//base", |
| 39 "//base/third_party/dynamic_annotations", | 38 "//base/third_party/dynamic_annotations", |
| 40 "//mojo/common", | 39 "//mojo/common", |
| 41 "//mojo/public/cpp/bindings", | 40 "//mojo/public/cpp/bindings", |
| 42 "//services/catalog/public/interfaces", | 41 "//services/catalog/public/interfaces", |
| 43 "//services/shell/public/cpp:sources", | 42 "//services/service_manager/public/cpp:sources", |
| 44 "//services/shell/public/interfaces", | 43 "//services/service_manager/public/interfaces", |
| 45 ] | 44 ] |
| 46 | 45 |
| 47 public_deps = [ | 46 public_deps = [ |
| 48 # ApplicationManager exposes and uses PackageManager types in its header. | 47 # ApplicationManager exposes and uses PackageManager types in its header. |
| 49 "//services/catalog:lib", | 48 "//services/catalog:lib", |
| 50 ] | 49 ] |
| 51 | 50 |
| 52 data_deps = [ | 51 data_deps = [ |
| 53 ":manifest", | 52 ":manifest", |
| 54 ] | 53 ] |
| 55 } | 54 } |
| 56 | 55 |
| 57 service_manifest("manifest") { | 56 service_manifest("manifest") { |
| 58 name = "shell" | 57 name = "shell" |
| 59 source = "manifest.json" | 58 source = "manifest.json" |
| 60 } | 59 } |
| OLD | NEW |