Revert of Use sysroot by default for all linux builds

build/common.gypi

 # Copyright (c) 2012 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 70 matching lines @@
 
           # Enable HiDPI support.
           'enable_hidpi%': 0,
 
           # Enable top chrome material design.
           'enable_topchrome_md%' : 0,
 
           # Enable Wayland display server support.
           'enable_wayland_server%' : 0,
 
-          # By default we build against a stable sysroot image to avoid
-          # depending on the packages installed on the local machine. Set this
-          # to 0 to build against locally installed headers and libraries (e.g.
-          # if packaging for a linux distro)
-          'use_sysroot%': 1,
+          # Build against pre-built sysroot image on linux.  By default
+          # the sysroot image is only used for Official builds or when cross
+          # compiling.
+          'use_sysroot%': 0,
 
           # Override buildtype to select the desired build flavor.
           # Dev - everyday build for development/testing
           # Official - release build (generally implies additional processing)
           # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
           # conversion is done), some of the things which are now controlled by
           # 'branding', such as symbol generation, will need to be refactored
           # based on 'buildtype' (i.e. we don't care about saving symbols for
           # non-Official # builds).
           'buildtype%': 'Dev',
@@ skipping 182 matching lines @@
               }, {
                 'mips_arch_variant%': 'r2',
               }],
             ],
           }],
 
           ['target_arch=="mipsel"', {
             'mips_arch_variant%': 'r1',
           }],
 
-          # The system root for linux compiles.
-          # Not used when chromecast=1 since ozone_platform_gbm doesn't
-          # currently build against the linux sysroot
-          # TODO(sbc): http://crbug.com/559708
-          ['OS=="linux" and chromeos==0 and chromecast==0 and use_sysroot==1', {
+          # The system root for cross-compiles. Default: none.
+          ['OS=="linux" and chromeos==0 and ((branding=="Chrome" and buildtype=="Official") or target_arch=="arm" or target_arch=="mipsel" or use_sysroot==1)', {
             # sysroot needs to be an absolute path otherwise it generates
             # incorrect results when passed to pkg-config
             'conditions': [
               ['target_arch=="arm"', {
                 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_arm-sysroot',
               }],
               ['target_arch=="x64"', {
                 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_amd64-sysroot',
               }],
               ['target_arch=="ia32"', {
@@ skipping 6063 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }