| OLD | NEW |
|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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("//services/shell/public/cpp/service.gni") | 6 import("//services/service_manager/public/cpp/service.gni") |
| 7 import("//services/shell/public/service_manifest.gni") | 7 import("//services/service_manager/public/service_manifest.gni") |
| 8 import("//mojo/public/tools/bindings/mojom.gni") | 8 import("//mojo/public/tools/bindings/mojom.gni") |
| 9 import("//tools/grit/repack.gni") | 9 import("//tools/grit/repack.gni") |
| 10 | 10 |
| 11 source_set("lib") { | 11 source_set("lib") { |
| 12 sources = [ | 12 sources = [ |
| 13 "session.cc", | 13 "session.cc", |
| 14 "session.h", | 14 "session.h", |
| 15 ] | 15 ] |
| 16 | 16 |
| 17 deps = [ | 17 deps = [ |
| 18 "//base", | 18 "//base", |
| 19 "//mash/login/public/interfaces", | 19 "//mash/login/public/interfaces", |
| 20 "//mash/session/public/interfaces", | 20 "//mash/session/public/interfaces", |
| 21 "//mojo/common", | 21 "//mojo/common", |
| 22 "//mojo/public/cpp/bindings", | 22 "//mojo/public/cpp/bindings", |
| 23 "//services/shell/public/cpp", | 23 "//services/service_manager/public/cpp", |
| 24 "//services/shell/public/cpp:sources", | 24 "//services/service_manager/public/cpp:sources", |
| 25 ] | 25 ] |
| 26 | 26 |
| 27 data_deps = [ | 27 data_deps = [ |
| 28 "//ash/mus", | 28 "//ash/mus", |
| 29 "//mash/app_driver", | 29 "//mash/app_driver", |
| 30 "//mash/quick_launch", | 30 "//mash/quick_launch", |
| 31 ] | 31 ] |
| 32 } | 32 } |
| 33 | 33 |
| 34 service("session") { | 34 service("session") { |
| 35 output_name = "mash_session" | 35 output_name = "mash_session" |
| 36 | 36 |
| 37 sources = [ | 37 sources = [ |
| 38 "main.cc", | 38 "main.cc", |
| 39 ] | 39 ] |
| 40 | 40 |
| 41 deps = [ | 41 deps = [ |
| 42 ":lib", | 42 ":lib", |
| 43 "//base", | 43 "//base", |
| 44 "//mash/session/public/interfaces", | 44 "//mash/session/public/interfaces", |
| 45 "//mojo/common", | 45 "//mojo/common", |
| 46 "//mojo/public/cpp/bindings", | 46 "//mojo/public/cpp/bindings", |
| 47 "//services/shell/public/cpp", | 47 "//services/service_manager/public/cpp", |
| 48 "//services/shell/public/cpp:sources", | 48 "//services/service_manager/public/cpp:sources", |
| 49 ] | 49 ] |
| 50 | 50 |
| 51 data_deps = [ | 51 data_deps = [ |
| 52 ":manifest", | 52 ":manifest", |
| 53 ] | 53 ] |
| 54 } | 54 } |
| 55 | 55 |
| 56 service_manifest("manifest") { | 56 service_manifest("manifest") { |
| 57 name = "mash_session" | 57 name = "mash_session" |
| 58 source = "manifest.json" | 58 source = "manifest.json" |
| 59 } | 59 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2419723002:
Move services/shell to services/service_manager (Closed)
