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

Unified Diff: ash/BUILD.gn

Issue 974543002: Remove link_chrome_on_windows GN flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | build/config/BUILDCONFIG.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/BUILD.gn
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index ed4cd139faaac8cb36c6ee6bd14c692b0a61c6c1..7db48e06ee3e4d14158ce1a7405738eb3b1ca714 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -352,48 +352,46 @@ test("ash_unittests") {
}
}
-if (!is_win || link_chrome_on_windows) {
- executable("ash_shell") {
- testonly = true
- sources = [
- "shell/shell_main.cc",
- ]
+executable("ash_shell") {
+ testonly = true
+ sources = [
+ "shell/shell_main.cc",
+ ]
- deps = [
- ":ash_shell_lib",
- "//components/user_manager",
- ]
+ deps = [
+ ":ash_shell_lib",
+ "//components/user_manager",
+ ]
- if (is_win) {
- configs -= [ "//build/config/win:console" ]
- configs += [ "//build/config/win:windowed" ]
- deps += [ "//sandbox" ]
- }
+ if (is_win) {
+ configs -= [ "//build/config/win:console" ]
+ configs += [ "//build/config/win:windowed" ]
+ deps += [ "//sandbox" ]
+ }
- if (is_chromeos) {
- deps += [ "//device/bluetooth" ]
- }
+ if (is_chromeos) {
+ deps += [ "//device/bluetooth" ]
}
+}
- test("ash_shell_unittests") {
- sources = [
- "shell/window_watcher_unittest.cc",
- "test/ash_unittests.cc",
- ]
+test("ash_shell_unittests") {
+ sources = [
+ "shell/window_watcher_unittest.cc",
+ "test/ash_unittests.cc",
+ ]
- deps = [
- ":ash_shell_lib",
- ":test_support",
- "//base/test:test_support",
- "//components/user_manager",
- "//content/test:test_support",
- "//skia",
- "//testing/gtest",
- "//ui/accessibility",
- ]
+ deps = [
+ ":ash_shell_lib",
+ ":test_support",
+ "//base/test:test_support",
+ "//components/user_manager",
+ "//content/test:test_support",
+ "//skia",
+ "//testing/gtest",
+ "//ui/accessibility",
+ ]
- if (is_chromeos) {
- deps += [ "//ui/display" ]
- }
+ if (is_chromeos) {
+ deps += [ "//ui/display" ]
}
}
« no previous file with comments | « no previous file | build/config/BUILDCONFIG.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698