Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2858)

Unified Diff: ash/mus/BUILD.gn

Issue 1874703003: Load ash_sysui resources with ResourceLoader. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for comment. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/mus/DEPS » ('j') | components/mus/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/BUILD.gn
diff --git a/ash/mus/BUILD.gn b/ash/mus/BUILD.gn
index d86ab228dd3a9660986c0891ad3176caff3e74f6..10027cade3dbeedaab5c581627f002e2f2590575 100644
--- a/ash/mus/BUILD.gn
+++ b/ash/mus/BUILD.gn
@@ -31,6 +31,7 @@ source_set("lib") {
"//components/mus/common:mus_common",
"//components/mus/public/cpp",
"//components/mus/public/interfaces",
+ "//components/resource_provider/public/cpp",
"//components/user_manager",
"//device/bluetooth",
"//mash/wm/public/interfaces",
@@ -56,9 +57,9 @@ source_set("lib") {
]
data_deps = [
- "//ash/strings:ash_test_strings",
- "//ash/resources:ash_test_resources_100_percent",
- "//ash/resources:ash_test_resources_200_percent",
+ ":resources_strings",
+ ":resources_100",
+ ":resources_200",
]
if (is_chromeos) {
@@ -86,3 +87,36 @@ mojo_native_application("mus") {
"//components/mus",
]
}
+
+resource_out_dir = "$root_out_dir/$mojo_application_subdir/ash_sysui/resources"
sky 2016/04/08 21:53:45 Instead of outputting to this location you should
kylechar 2016/04/11 13:16:33 Didn't realize that was a thing. Done. The only th
sky 2016/04/11 15:00:30 I think that's the common pattern, even for non-mu
+
+#TODO(msw): Do not load 'test' resources (include sys lang?).
+repack("resources_strings") {
+ sources = [
+ "$root_out_dir/ash_test_strings.pak",
+ ]
+ output = "$resource_out_dir/ash_resources_strings.pak"
+ deps = [
+ "//ash/strings:ash_test_strings",
+ ]
+}
+
+repack("resources_100") {
+ sources = [
+ "$root_out_dir/ash_test_resources_100_percent.pak",
+ ]
+ output = "$resource_out_dir/ash_resources_100_percent.pak"
+ deps = [
+ "//ash/resources:ash_test_resources_100_percent",
+ ]
+}
+
+repack("resources_200") {
+ sources = [
+ "$root_out_dir/ash_test_resources_200_percent.pak",
+ ]
+ output = "$resource_out_dir/ash_resources_200_percent.pak"
+ deps = [
+ "//ash/resources:ash_test_resources_200_percent",
+ ]
+}
« no previous file with comments | « no previous file | ash/mus/DEPS » ('j') | components/mus/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698