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

Unified Diff: ash/BUILD.gn

Issue 1291703008: Rename is_chromeos in chrome/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: retry Created 5 years, 4 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 | « apps/BUILD.gn ('k') | base/BUILD.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 2f53cce59f79107a5523f632b0c4c86ceb9e3a89..9084e047321300bba7465572ceffe80afad6ad3e 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -92,7 +92,7 @@ component("ash") {
]
}
- if (is_chromeos) {
+ if (use_cros_fe) {
deps += [
"//device/bluetooth",
"//ui/display",
@@ -315,7 +315,7 @@ test("ash_unittests") {
"//url",
]
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources -= [
# TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
"focus_cycler_unittest.cc",
@@ -344,7 +344,7 @@ test("ash_unittests") {
if (!use_x11) {
sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ]
}
- if (is_chromeos) {
+ if (use_cros_fe) {
sources += [ "first_run/first_run_helper_unittest.cc" ]
deps += [
"//device/bluetooth",
@@ -363,7 +363,7 @@ test("ash_unittests") {
]
}
- if (!use_x11 || !is_chromeos) {
+ if (!use_x11 || !use_cros_fe) {
sources -= [ "touch/touch_transformer_controller_unittest.cc" ]
}
@@ -371,7 +371,7 @@ test("ash_unittests") {
#['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
# ldflags = "-rdynamic"
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources -= [ "sticky_keys/sticky_keys_unittest.cc" ]
}
}
@@ -393,7 +393,7 @@ executable("ash_shell") {
deps += [ "//sandbox" ]
}
- if (is_chromeos) {
+ if (use_cros_fe) {
deps += [ "//device/bluetooth" ]
}
}
« no previous file with comments | « apps/BUILD.gn ('k') | base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698