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

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: Rebase. 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') | no next file with comments »
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 99273fcb14c63073ad7d9df5bfa5f0c1b94cc09e..ab70b0ddade02f0b8a1c2b0e36cc7d08883f2dbd 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/shelf/public/interfaces",
@@ -57,12 +58,6 @@ source_set("lib") {
"//ui/views/mus:for_mojo_application",
]
- data_deps = [
- "//ash/strings:ash_test_strings",
- "//ash/resources:ash_test_resources_100_percent",
- "//ash/resources:ash_test_resources_200_percent",
- ]
-
if (is_chromeos) {
deps += [ "//chromeos" ]
}
@@ -80,6 +75,9 @@ mojo_native_application("mus") {
]
deps = [
":lib",
+ ":resources_100",
+ ":resources_200",
+ ":resources_strings",
"//mojo/shell/public/cpp",
]
@@ -87,4 +85,41 @@ mojo_native_application("mus") {
":manifest",
"//components/mus",
]
+
+ resources = [
+ "$root_out_dir/ash_resources_strings.pak",
+ "$root_out_dir/ash_resources_100_percent.pak",
+ "$root_out_dir/ash_resources_200_percent.pak",
+ ]
+}
+
+#TODO(msw): Do not load 'test' resources (include sys lang?).
+repack("resources_strings") {
+ sources = [
+ "$root_out_dir/ash_test_strings.pak",
+ ]
+ output = "$root_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 = "$root_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 = "$root_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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698