Chromium Code Reviews| Index: ash/resources/BUILD.gn |
| diff --git a/ash/resources/BUILD.gn b/ash/resources/BUILD.gn |
| index 8fa121fbc1875fc4c42ba1614f1617ceddd31105..2324103e2d7f860d9edcc3114a44dd044cd148b8 100644 |
| --- a/ash/resources/BUILD.gn |
| +++ b/ash/resources/BUILD.gn |
| @@ -23,7 +23,7 @@ template("ash_test_resources") { |
| percent = invoker.percent |
| repack("ash_test_resources_${target_name}") { |
| - output = "$root_build_dir/ash_test_resources_${percent}_percent.pak" |
| + output = "$root_build_dir/${target_name}.pak" |
| sources = [ |
| "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak", |
| @@ -31,18 +31,22 @@ template("ash_test_resources") { |
| ] |
| if (percent == "100") { |
| - sources += [ |
| - "$root_gen_dir/content/content_resources.pak", |
| - "$root_gen_dir/ui/resources/webui_resources.pak", |
| - ] |
| + sources += [ "$root_gen_dir/ui/resources/webui_resources.pak" ] |
| + } |
| + |
| + if (defined(invoker.sources)) { |
| + sources += invoker.sources |
| } |
| deps = [ |
| "//ash/resources", |
| - "//content:resources", |
| "//ui/resources", |
| ] |
| + if (defined(invoker.deps)) { |
| + deps += invoker.deps |
| + } |
| + |
| if (toolkit_views) { |
| deps += [ |
| "//ui/app_list/resources", |
| @@ -75,3 +79,15 @@ ash_test_resources("100_percent") { |
| ash_test_resources("200_percent") { |
| percent = "200" |
| } |
| + |
| +# There is no content_200_percent as content resources are only available at |
|
msw
2016/09/06 22:57:38
We could generate ash_test_resources[with_]_conten
sky
2016/09/06 23:25:00
I originally did that (which is why I have AddData
|
| +# 100%. |
| +ash_test_resources("content_100_percent") { |
|
msw
2016/09/06 22:57:38
nit: with_content_100_percent?
sky
2016/09/06 23:25:00
Done.
|
| + percent = "100" |
| + sources = [ |
| + "$root_gen_dir/content/content_resources.pak", |
| + ] |
| + deps = [ |
| + "//content:resources", |
| + ] |
| +} |