Add a build arg to control whether to use a jessie sysroot.

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/config/chrome_build.gni")
 
 declare_args() {
   # The absolute path of the sysroot that is applied when compiling using
   # the target toolchain.
   target_sysroot = ""
 
   # The absolute path to directory containing sysroots for linux 32 and 64bit
   target_sysroot_dir = ""
 
   use_sysroot = true
+
+  # TODO(tonikitoo): Remove this arg when wheezy is finally dropped and we
+  # can just use debian/jessie everywhere by default. crbug.com/564904.
+  use_jessie_sysroot = false
 }
 
 if (is_linux && target_sysroot_dir != "") {
   if (current_cpu == "x64") {
     sysroot = target_sysroot_dir + "/wheezy-x64"
   } else if (current_cpu == "x86") {
     sysroot = target_sysroot_dir + "/wheezy-ia32"
   }
 } else if (current_os == target_os && current_cpu == target_cpu &&
            target_sysroot != "") {
@@ skipping 22 matching lines @@
     # Regular ChromeOS builds use custom sysroots, but desktop ChromeOS (where
     # we're building linux desktop binaries but using the ChromeOS UI and
     # functionality where possible) needs to run on the buliders, which are
     # running precise.  The precise build has a different set of dependencies
     # from the wheezy build, so we cannot use the wheezy sysroot.
     sysroot = "//build/linux/ubuntu_precise_amd64-sysroot"
   } else {
     if (current_cpu == "x64") {
       sysroot = "//build/linux/debian_wheezy_amd64-sysroot"
 
-      # TODO(tonikitoo): Remove the whole if clause below when debian/wheezy
-      # sysroots are switched to debian/jessie, crbug.com/564904.
-      import("//build_overrides/build.gni")
-      if (build_with_chromium) {
-        import("//ui/ozone/ozone.gni")
-        import("//ui/base/ui_features.gni")
-        if (use_ozone && use_xkbcommon) {
-          sysroot = "//build/linux/debian_jessie_amd64-sysroot"
-        }
+      if (use_jessie_sysroot) {
+        sysroot = "//build/linux/debian_jessie_amd64-sysroot"
       }
     } else if (current_cpu == "x86") {
       sysroot = "//build/linux/debian_wheezy_i386-sysroot"
     } else if (current_cpu == "mipsel") {
       sysroot = "//build/linux/debian_wheezy_mips-sysroot"
     } else if (current_cpu == "arm") {
       sysroot = "//build/linux/debian_wheezy_arm-sysroot"
     } else if (current_cpu == "arm64") {
       sysroot = "//build/linux/debian_jessie_arm64-sysroot"
     } else {
@@ skipping 23 matching lines @@
   }
 } else if (is_mac) {
   import("//build/config/mac/mac_sdk.gni")
   sysroot = mac_sdk_path
 } else if (is_ios) {
   import("//build/config/ios/ios_sdk.gni")
   sysroot = ios_sdk_path
 } else {
   sysroot = ""
 }