| 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("//mojo/public/tools/bindings/mojom.gni") | 6 import("//mojo/public/tools/bindings/mojom.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 import("//tools/grit/repack.gni") | 9 import("//tools/grit/repack.gni") |
| 10 | 10 |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 deps = [ | 132 deps = [ |
| 133 ":lib", | 133 ":lib", |
| 134 ":resources", | 134 ":resources", |
| 135 ":resources_200", | 135 ":resources_200", |
| 136 "//services/service_manager/public/cpp", | 136 "//services/service_manager/public/cpp", |
| 137 ] | 137 ] |
| 138 | 138 |
| 139 # TODO(beng): This target relies on //mash/session, but there is a cycle so we | 139 # TODO(beng): This target relies on //mash/session, but there is a cycle so we |
| 140 # can't state that dependency here. | 140 # can't state that dependency here. |
| 141 data_deps = [ | 141 data_deps = [ |
| 142 ":manifest", | 142 ":resources", |
| 143 ":resources_200", |
| 143 "//services/ui", | 144 "//services/ui", |
| 144 ] | 145 ] |
| 145 | |
| 146 resources = [ | |
| 147 "$root_out_dir/ash_mus_resources.pak", | |
| 148 "$root_out_dir/ash_mus_resources_200.pak", | |
| 149 ] | |
| 150 } | 146 } |
| 151 | 147 |
| 152 service_manifest("manifest") { | 148 service_manifest("manifest") { |
| 153 name = "ash" | 149 name = "ash" |
| 154 source = "manifest.json" | 150 source = "manifest.json" |
| 155 } | 151 } |
| 156 | 152 |
| 157 # TODO: Load locale-specific strings. | 153 # TODO: Load locale-specific strings. |
| 158 # TODO: Avoid duplication between Mash and Chrome pak files: crbug.com/628715. | 154 # TODO: Avoid duplication between Mash and Chrome pak files: crbug.com/628715. |
| 159 repack("resources") { | 155 repack("resources") { |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 "//ui/views/mus", | 244 "//ui/views/mus", |
| 249 ] | 245 ] |
| 250 | 246 |
| 251 data_deps = [ | 247 data_deps = [ |
| 252 ":mus", | 248 ":mus", |
| 253 "//mash/quick_launch", | 249 "//mash/quick_launch", |
| 254 ] | 250 ] |
| 255 | 251 |
| 256 defines = [ "NOTIMPLEMENTED_POLICY=5" ] | 252 defines = [ "NOTIMPLEMENTED_POLICY=5" ] |
| 257 } | 253 } |
| OLD | NEW |