Rename & rework is_chromeos

build/config/sysroot.gni

 # 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.
 
 # This header file defines the "sysroot" variable which is the absolute path
 # of the sysroot. If no sysroot applies, the variable will be an empty string.
 
 import("//build/module_args/nacl.gni")
 import("$nacl_shared_build_dir/config/chrome_build.gni")
 
 if (is_android) {
   import("$nacl_shared_build_dir/config/android/config.gni")
   if (current_cpu == "x86") {
     sysroot = rebase_path("$android_ndk_root/$x86_android_sysroot_subdir")
   } else if (current_cpu == "arm") {
     sysroot = rebase_path("$android_ndk_root/$arm_android_sysroot_subdir")
   } else if (current_cpu == "mipsel") {
     sysroot = rebase_path("$android_ndk_root/$mips_android_sysroot_subdir")
   } else {
     sysroot = ""
   }
-} else if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) {

[Peter Mayo, 2015/08/13 02:40:43]

is_desktop_linux looks better here.

+} else if (is_linux && !is_chromeos && is_chrome_branded && is_official_build) {
   # For official builds, use the sysroot checked into the internal source repo
   # so that the builds work on older versions of Linux.
   if (current_cpu == "x64") {
     sysroot =
         rebase_path("//chrome/installer/linux/debian_wheezy_amd64-sysroot")
   } else if (current_cpu == "x86") {
     sysroot = rebase_path("//chrome/installer/linux/debian_wheezy_i386-sysroot")
   } else {
     # Any other builds don't use a sysroot.
     sysroot = ""
   }
-} else if (is_linux && !is_chromeos) {
+} else if (is_desktop_linux) {
   if (current_cpu == "mipsel") {
     sysroot = rebase_path("//mipsel-sysroot/sysroot")
   } else {
     sysroot = ""
   }
 } else if (is_mac) {
   import("$nacl_shared_build_dir/config/mac/mac_sdk.gni")
 
   sysroot = mac_sdk_path
 } else if (is_ios) {
   import("$nacl_shared_build_dir/config/ios/ios_sdk.gni")
   sysroot = ios_sdk_path
 } else {
   sysroot = ""
 }