Use new jessie sysroot for cros-desktop builds too.

BUG=706006,598033

Review-Url: https://codereview.chromium.org/2772403002
Cr-Original-Commit-Position: refs/heads/master@{#461095}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 17498ec3190acff0ae88d3083543a50da9d0af83

config/sysroot.gni

@@ -47,30 +47,19 @@ if (is_linux && target_sysroot_dir != "") {
 } else if (is_linux && use_sysroot) {
   # By default build against a sysroot image downloaded from Cloud Storage
   # during gclient runhooks.
-  if (is_chromeos) {
-    # 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.
-    # TODO(sbc): This condition can perhaps be eliminated now that we are
-    # using jessie rather than wheezy.
-    sysroot = "//build/linux/ubuntu_precise_amd64-sysroot"
+  if (current_cpu == "x64") {
+    sysroot = "//build/linux/debian_jessie_amd64-sysroot"
+  } else if (current_cpu == "x86") {
+    sysroot = "//build/linux/debian_jessie_i386-sysroot"
+  } else if (current_cpu == "mipsel") {
+    sysroot = "//build/linux/debian_jessie_mips-sysroot"
+  } else if (current_cpu == "arm") {
+    sysroot = "//build/linux/debian_jessie_arm-sysroot"
+  } else if (current_cpu == "arm64") {
+    sysroot = "//build/linux/debian_jessie_arm64-sysroot"
   } else {
-    if (current_cpu == "x64") {
-      sysroot = "//build/linux/debian_jessie_amd64-sysroot"
-    } else if (current_cpu == "x86") {
-      sysroot = "//build/linux/debian_jessie_i386-sysroot"
-    } else if (current_cpu == "mipsel") {
-      sysroot = "//build/linux/debian_jessie_mips-sysroot"
-    } else if (current_cpu == "arm") {
-      sysroot = "//build/linux/debian_jessie_arm-sysroot"
-    } else if (current_cpu == "arm64") {
-      sysroot = "//build/linux/debian_jessie_arm64-sysroot"
-    } else {
-      # Any other builds don't use a sysroot.
-      sysroot = ""
-    }
+    # Any other builds don't use a sysroot.
+    sysroot = ""
   }
 
   if (sysroot != "") {