Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1146)

Unified Diff: build/config/sysroot.gni

Issue 2783193002: Reland of "Update linux sysroot from Wheezy to Jessie" (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/linux/sysroot_scripts/install-sysroot.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/sysroot.gni
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
index 2bcd6caae1e9a468e7b39f3613c41d2eac5b6ea9..5ea877752a790f7056c7493c10c8ace62a6092bc 100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -16,10 +16,6 @@
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 != "") {
@@ -57,20 +53,18 @@
# 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"
} else {
if (current_cpu == "x64") {
- sysroot = "//build/linux/debian_wheezy_amd64-sysroot"
-
- if (use_jessie_sysroot) {
- sysroot = "//build/linux/debian_jessie_amd64-sysroot"
- }
+ sysroot = "//build/linux/debian_jessie_amd64-sysroot"
} else if (current_cpu == "x86") {
- sysroot = "//build/linux/debian_wheezy_i386-sysroot"
+ sysroot = "//build/linux/debian_jessie_i386-sysroot"
} else if (current_cpu == "mipsel") {
- sysroot = "//build/linux/debian_wheezy_mips-sysroot"
+ sysroot = "//build/linux/debian_jessie_mips-sysroot"
} else if (current_cpu == "arm") {
- sysroot = "//build/linux/debian_wheezy_arm-sysroot"
+ sysroot = "//build/linux/debian_jessie_arm-sysroot"
} else if (current_cpu == "arm64") {
sysroot = "//build/linux/debian_jessie_arm64-sysroot"
} else {
« no previous file with comments | « no previous file | build/linux/sysroot_scripts/install-sysroot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698