Commit d1ba845f authored by jamescook's avatar jamescook Committed by Commit bot

Remove non-chromeos support from src/ash/resources/BUILD.gn

Ash only ships on Chrome OS, so simplify our BUILD.gn files by removing
all the is_win and is_chromeos conditionals.

This also removes a dependency from chrome/browser/ui/BUILD.gn that existed
for all use_aura builds. Aura should not require ash on Windows or Linux.

BUG=666776
TEST=bots

Review-Url: https://codereview.chromium.org/2569723003
Cr-Commit-Position: refs/heads/master@{#437973}
parent a861123b
...@@ -6,6 +6,7 @@ import("//tools/grit/grit_rule.gni") ...@@ -6,6 +6,7 @@ import("//tools/grit/grit_rule.gni")
import("//tools/grit/repack.gni") import("//tools/grit/repack.gni")
import("//ui/base/ui_features.gni") import("//ui/base/ui_features.gni")
assert(is_chromeos)
assert(enable_hidpi) assert(enable_hidpi)
grit("resources") { grit("resources") {
...@@ -27,7 +28,10 @@ template("ash_test_resources") { ...@@ -27,7 +28,10 @@ template("ash_test_resources") {
sources = [ sources = [
"$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak", "$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/resources/ui_resources_${percent}_percent.pak",
"$root_gen_dir/ui/views/resources/views_resources_${percent}_percent.pak",
] ]
if (percent == "100") { if (percent == "100") {
...@@ -40,34 +44,20 @@ template("ash_test_resources") { ...@@ -40,34 +44,20 @@ template("ash_test_resources") {
deps = [ deps = [
"//ash/resources", "//ash/resources",
"//ui/app_list/resources",
"//ui/chromeos/resources",
"//ui/resources", "//ui/resources",
"//ui/views/resources",
] ]
if (defined(invoker.deps)) { if (defined(invoker.deps)) {
deps += invoker.deps deps += invoker.deps
} }
if (toolkit_views) { if (percent == "100") {
deps += [ # TODO(msw): This seems bad, but follows repack_ui_test_pak's example.
"//ui/app_list/resources", deps += [ "//third_party/WebKit/public:resources_grit" ]
"//ui/views/resources", sources += [ "$root_gen_dir/blink/public/resources/blink_resources.pak" ]
]
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" ]
} }
} }
} }
......
...@@ -2067,8 +2067,6 @@ split_static_library("ui") { ...@@ -2067,8 +2067,6 @@ split_static_library("ui") {
"window_sizer/window_sizer_aura.cc", "window_sizer/window_sizer_aura.cc",
] ]
deps += [ deps += [
# aura uses some of ash resources.
"//ash/resources",
"//ui/aura", "//ui/aura",
"//ui/keyboard", "//ui/keyboard",
"//ui/keyboard:keyboard_with_content", "//ui/keyboard:keyboard_with_content",
......
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