| 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/mojo_application.gni") | 6 import("//mojo/public/mojo_application.gni") |
| 7 import("//mojo/public/mojo_application_manifest.gni") | 7 import("//mojo/public/mojo_application_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 |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 mojo_application_manifest("manifest") { | 145 mojo_application_manifest("manifest") { |
| 146 application_name = "ash" | 146 application_name = "ash" |
| 147 source = "manifest.json" | 147 source = "manifest.json" |
| 148 } | 148 } |
| 149 | 149 |
| 150 # TODO: Load resources at additional scales and load locale-specific strings. | 150 # TODO: Load resources at additional scales and load locale-specific strings. |
| 151 # TODO: Avoid duplication between Mash and Chrome pak files: crbug.com/628715. | 151 # TODO: Avoid duplication between Mash and Chrome pak files: crbug.com/628715. |
| 152 repack("resources") { | 152 repack("resources") { |
| 153 output = "$root_out_dir/ash_mus_resources.pak" | 153 output = "$root_out_dir/ash_mus_resources.pak" |
| 154 sources = [ | 154 sources = [ |
| 155 "$root_gen_dir/ash/common/strings/ash_strings_en-US.pak", |
| 155 "$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak", | 156 "$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak", |
| 156 "$root_gen_dir/ash/resources/ash_resources_100_percent.pak", | 157 "$root_gen_dir/ash/resources/ash_resources_100_percent.pak", |
| 157 "$root_gen_dir/ash/strings/ash_strings_en-US.pak", | |
| 158 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", | 158 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", |
| 159 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", | 159 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", |
| 160 "$root_gen_dir/ui/strings/ui_strings_en-US.pak", | 160 "$root_gen_dir/ui/strings/ui_strings_en-US.pak", |
| 161 "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak", | 161 "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak", |
| 162 ] | 162 ] |
| 163 deps = [ | 163 deps = [ |
| 164 "//ash/common/strings", |
| 164 "//ash/mus/resources", | 165 "//ash/mus/resources", |
| 165 "//ash/resources", | 166 "//ash/resources", |
| 166 "//ash/strings", | |
| 167 "//ui/resources", | 167 "//ui/resources", |
| 168 "//ui/strings", | 168 "//ui/strings", |
| 169 "//ui/views/mus:resources", | 169 "//ui/views/mus:resources", |
| 170 "//ui/views/resources", | 170 "//ui/views/resources", |
| 171 ] | 171 ] |
| 172 } | 172 } |
| 173 | 173 |
| 174 source_set("unittests") { | 174 source_set("unittests") { |
| 175 testonly = true | 175 testonly = true |
| 176 | 176 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 "//ui/gfx/geometry", | 213 "//ui/gfx/geometry", |
| 214 "//ui/gfx/geometry/mojo", | 214 "//ui/gfx/geometry/mojo", |
| 215 "//ui/views/mus", | 215 "//ui/views/mus", |
| 216 ] | 216 ] |
| 217 | 217 |
| 218 data_deps = [ | 218 data_deps = [ |
| 219 ":mus", | 219 ":mus", |
| 220 "//mash/quick_launch", | 220 "//mash/quick_launch", |
| 221 ] | 221 ] |
| 222 } | 222 } |
| OLD | NEW |