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

Unified Diff: ash/resources/BUILD.gn

Issue 2569723003: Remove non-chromeos support from src/ash/resources/BUILD.gn (Closed)
Patch Set: cleanup Created 4 years 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 | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/resources/BUILD.gn
diff --git a/ash/resources/BUILD.gn b/ash/resources/BUILD.gn
index 1454da54676143d1717b93eef70514ad4044977c..57aeab683b9b57a012bfd06deeca19bf9e550824 100644
--- a/ash/resources/BUILD.gn
+++ b/ash/resources/BUILD.gn
@@ -6,6 +6,7 @@ import("//tools/grit/grit_rule.gni")
import("//tools/grit/repack.gni")
import("//ui/base/ui_features.gni")
+assert(is_chromeos)
assert(enable_hidpi)
grit("resources") {
@@ -27,7 +28,10 @@ template("ash_test_resources") {
sources = [
"$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak",
+ "$root_gen_dir/ui/app_list/resources/app_list_resources_${percent}_percent.pak",
+ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak",
"$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
+ "$root_gen_dir/ui/views/resources/views_resources_${percent}_percent.pak",
]
if (percent == "100") {
@@ -40,34 +44,20 @@ template("ash_test_resources") {
deps = [
"//ash/resources",
+ "//ui/app_list/resources",
+ "//ui/chromeos/resources",
"//ui/resources",
+ "//ui/views/resources",
]
if (defined(invoker.deps)) {
deps += invoker.deps
}
- if (toolkit_views) {
- deps += [
- "//ui/app_list/resources",
- "//ui/views/resources",
- ]
- sources += [
- "$root_gen_dir/ui/app_list/resources/app_list_resources_${percent}_percent.pak",
- "$root_gen_dir/ui/views/resources/views_resources_${percent}_percent.pak",
- ]
-
- if (percent == "100") {
- # TODO(msw): This seems bad, but follows repack_ui_test_pak's example.
- deps += [ "//third_party/WebKit/public:resources_grit" ]
- sources +=
- [ "$root_gen_dir/blink/public/resources/blink_resources.pak" ]
- }
- }
-
- if (is_chromeos) {
- sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak" ]
- deps += [ "//ui/chromeos/resources" ]
+ if (percent == "100") {
+ # TODO(msw): This seems bad, but follows repack_ui_test_pak's example.
+ deps += [ "//third_party/WebKit/public:resources_grit" ]
+ sources += [ "$root_gen_dir/blink/public/resources/blink_resources.pak" ]
}
}
}
« no previous file with comments | « no previous file | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698