Rename is_chromeos.

build/config/BUILDCONFIG.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # =============================================================================
 # PLATFORM SELECTION
 # =============================================================================
 #
 # There are two main things to set: "os" and "cpu". The "toolchain" is the name
 # of the GN thing that encodes combinations of these things.
@@ skipping 107 matching lines @@
   #   0 means no symbols.
   #   -1 means auto-set (off in release, regular in debug).
   symbol_level = -1
 
   # Component build.
   is_component_build = false
 
   # Debug build.
   is_debug = true
 
+  # Whether we're using a chromeos user interface.
+  is_chromeos_ui = current_os == "chromeos"
+
   # Whether we're a traditional desktop unix.
-  is_desktop_linux = current_os == "linux" && current_os != "chromeos"
+  is_desktop_linux = current_os == "linux"
 
   # Set to true when compiling with the Clang compiler. Typically this is used
   # to configure warnings.
   is_clang = current_os == "mac" || current_os == "ios" ||
              current_os == "linux" || current_os == "chromeos"
 
   # Compile for Address Sanitizer to find memory bugs.
   is_asan = false
 
   # Compile for Leak Sanitizer to find leaks.
   is_lsan = false
 
   # Compile for Memory Sanitizer to find uninitialized reads.
   is_msan = false
 
   # Compile for Thread Sanitizer to find threading bugs.
   is_tsan = false
 
-  if (current_os == "chromeos") {
-    # Allows the target toolchain to be injected as arguments. This is needed
-    # to support the CrOS build system which supports per-build-configuration
-    # toolchains.
-    cros_use_custom_toolchain = false
-  }
+  # Allows the target toolchain to be injected as arguments. This is needed
+  # to support the CrOS build system which supports per-build-configuration
+  # toolchains.
+  cros_use_custom_toolchain = false

[Peter Mayo, 2015/08/13 01:46:46]

This change can be separated.

[Peter Mayo, 2015/08/13 02:07:38]

Done.  https://codereview.chromium.org/1287153002/

 
   # DON'T ADD MORE FLAGS HERE. Read the comment above.
 }
 
 # =============================================================================
 # OS DEFINITIONS
 # =============================================================================
 #
 # We set these various is_FOO booleans for convenience in writing OS-based
 # conditions.
 #
-# - is_android, is_chromeos, is_ios, and is_win should be obvious.
+# - is_android, is_chromeos_os, is_ios, and is_win should be obvious.
 # - is_mac is set only for desktop Mac. It is not set on iOS.
 # - is_posix is true for mac and any Unix-like system (basically everything
 #   except Windows).
 # - is_linux is true for desktop Linux and ChromeOS, but not Android (which is
 #   generally too different despite being based on the Linux kernel).
 #
 # Do not add more is_* variants here for random lesser-used Unix systems like
 # aix or one of the BSDs. If you need to check these, just check the
 # current_os value directly.
 
 if (current_os == "win" || current_os == "winrt_81" ||
     current_os == "winrt_81_phone" || current_os == "winrt_10") {
   is_android = false
-  is_chromeos = false
+  is_chromeos_os = false
   is_ios = false
   is_linux = false
   is_mac = false
   is_nacl = false
   is_posix = false
   is_win = true
 } else if (current_os == "mac") {
   is_android = false
-  is_chromeos = false
+  is_chromeos_os = false
   is_ios = false
   is_linux = false
   is_mac = true
   is_nacl = false
   is_posix = true
   is_win = false
 } else if (current_os == "android") {
   is_android = true
-  is_chromeos = false
+  is_chromeos_os = false
   is_ios = false
   is_linux = false
   is_mac = false
   is_nacl = false
   is_posix = true
   is_win = false
 } else if (current_os == "chromeos") {
   is_android = false
-  is_chromeos = true
+  assert(is_chromeos_ui)

[Peter Mayo, 2015/08/13 01:46:46]

Provide message with assert.

[Peter Mayo, 2015/08/13 02:07:38]

Done.

+  is_chromeos_os = true
   is_ios = false
   is_linux = true
   is_mac = false
   is_nacl = false
   is_posix = true
   is_win = false
 } else if (current_os == "nacl") {
   # current_os == "nacl" will be passed by the nacl toolchain definition.
   # It is not set by default or on the command line. We treat is as a
   # Posix variant.
   is_android = false
-  is_chromeos = false
+  is_chromeos_os = false
   is_ios = false
   is_linux = false
   is_mac = false
   is_nacl = true
   is_posix = true
   is_win = false
 } else if (current_os == "ios") {
   is_android = false
-  is_chromeos = false
+  is_chromeos_os = false
   is_ios = true
   is_linux = false
   is_mac = false
   is_nacl = false
   is_posix = true
   is_win = false
 } else if (current_os == "linux") {
   is_android = false
-  is_chromeos = false
+  is_chromeos_os = false
   is_ios = false
   is_linux = true
   is_mac = false
   is_nacl = false
   is_posix = true
   is_win = false
 }
 
+# This is for backwards compatability until the rename in complete in all
+# dependent files.
+is_chromeos = is_chromeos_ui
+
 # =============================================================================
 # SOURCES FILTERS
 # =============================================================================
 #
 # These patterns filter out platform-specific files when assigning to the
 # sources variable. The magic variable |sources_assignment_filter| is applied
 # to each assignment or appending to the sources variable and matches are
 # automatcally removed.
 #
 # Note that the patterns are NOT regular expressions. Only "*" and "\b" (path
@@ skipping 66 matching lines @@
 }
 if (!is_android) {
   sources_assignment_filter += [
     "*_android.h",
     "*_android.cc",
     "*_android_unittest.h",
     "*_android_unittest.cc",
     "*\bandroid/*",
   ]
 }
-if (!is_chromeos) {
+if (!is_chromeos_ui) {
   sources_assignment_filter += [
     "*_chromeos.h",
     "*_chromeos.cc",
     "*_chromeos_unittest.h",
     "*_chromeos_unittest.cc",
     "*\bchromeos/*",
   ]
 }
 
 # DO NOT ADD MORE PATTERNS TO THIS LIST, see set_sources_assignment_filter call
@@ skipping 238 matching lines @@
     set_default_toolchain("//build/toolchain/android:$current_cpu")
   }
 } else if (is_linux) {
   if (is_clang) {
     host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
     set_default_toolchain("//build/toolchain/linux:clang_$current_cpu")
   } else {
     host_toolchain = "//build/toolchain/linux:$host_cpu"
     set_default_toolchain("//build/toolchain/linux:$current_cpu")
   }
-  if (is_chromeos && cros_use_custom_toolchain) {
+  if (cros_use_custom_toolchain) {

[Peter Mayo, 2015/08/13 01:46:46]

Part of second change.

     set_default_toolchain("//build/toolchain/cros:target")
   }
 } else if (is_mac) {
   host_toolchain = "//build/toolchain/mac:clang_x64"
   set_default_toolchain(host_toolchain)
 } else if (is_ios) {
   host_toolchain = "//build/toolchain/mac:clang_x64"
   set_default_toolchain("//build/toolchain/mac:ios_clang_arm")
 } else if (is_nacl) {
   # TODO(GYP): This will need to change when we get NaCl working
@@ skipping 17 matching lines @@
     forward_variables_from(invoker, "*")
 
     # All shared libraries must have the sanitizer deps to properly link in
     # asan mode (this target will be empty in other cases).
     if (!defined(deps)) {
       deps = []
     }
     deps += [ "//build/config/sanitizers:deps" ]
   }
 }