Commit e1f7c121 authored by sky's avatar sky Committed by Commit bot

Makes mojo:ash resources include ash/resources

The combined wm/shell now needs ash/resources too.

BUG=616265
TEST=none
R=ben@chromium.org

Review-Url: https://codereview.chromium.org/2039633002
Cr-Commit-Position: refs/heads/master@{#397854}
parent 8c10ae7e
...@@ -138,6 +138,7 @@ mojo_application_manifest("manifest") { ...@@ -138,6 +138,7 @@ mojo_application_manifest("manifest") {
repack("resources") { repack("resources") {
sources = [ sources = [
"$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak", "$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak",
"$root_gen_dir/ash/resources/ash_resources_100_percent.pak",
"$root_gen_dir/ui/resources/ui_resources_100_percent.pak", "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
"$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak", "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
...@@ -146,6 +147,7 @@ repack("resources") { ...@@ -146,6 +147,7 @@ repack("resources") {
output = "$root_out_dir/ash_mus_resources.pak" output = "$root_out_dir/ash_mus_resources.pak"
deps = [ deps = [
"//ash/mus/resources", "//ash/mus/resources",
"//ash/resources",
"//ui/resources", "//ui/resources",
"//ui/strings", "//ui/strings",
"//ui/views/mus:resources", "//ui/views/mus:resources",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment