Index: build/config/sysroot.gni |
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni |
index 5ea877752a790f7056c7493c10c8ace62a6092bc..60fc290af5ee8d9cd5348b829fb8078bc6283476 100644 |
--- a/build/config/sysroot.gni |
+++ b/build/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 != "") { |