Index: base/BUILD.gn |
diff --git a/base/BUILD.gn b/base/BUILD.gn |
index ccb580f1dab092a83d7307956864eabd033b4c53..e40f967887f5ba4584205fdd07fe7bf333812c97 100644 |
--- a/base/BUILD.gn |
+++ b/base/BUILD.gn |
@@ -684,7 +684,7 @@ component("base") { |
# Allow more direct string conversions on platforms with native utf8 |
# strings |
- if (is_mac || is_ios || is_chromeos) { |
+ if (is_mac || is_ios || is_chromeos_os) { |
defines = [ "SYSTEM_NATIVE_UTF8" ] |
} |
@@ -710,7 +710,7 @@ component("base") { |
libs = [ "log" ] |
} |
- if (is_chromeos) { |
+ if (is_chromeos_ui) { |
sources -= [ "power_monitor/power_monitor_device_source_posix.cc" ] |
} |
@@ -1020,7 +1020,7 @@ component("i18n") { |
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
} |
-if (is_ios || is_win || (is_linux && !is_chromeos)) { |
+if (is_ios || is_win || is_desktop_linux) { |
# TODO(GYP): Figure out which of these work and are needed on other platforms. |
test("base_perftests") { |
sources = [ |
@@ -1452,7 +1452,7 @@ test("base_unittests") { |
# Allow more direct string conversions on platforms with native utf8 |
# strings |
- if (is_mac || is_ios || is_chromeos) { |
+ if (is_mac || is_ios || is_chromeos_os) { |
defines = [ "SYSTEM_NATIVE_UTF8" ] |
} |