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

Unified Diff: build/config/sysroot.gni

Issue 2285563002: Revert of Desktop Chrome OS: Build with precise sysroot (Closed)
Patch Set: Created 4 years, 4 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 7fed8b3ee238a807611c9580fd51d53e7600bd06..b815d2ac6507c0190649b18efba279737b3d9502 100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -44,31 +44,22 @@
} else {
sysroot = ""
}
-} else if (is_linux && use_sysroot) {
+} else if (is_linux && !is_chromeos && 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.
- sysroot = "//build/linux/ubuntu_precise_amd64-sysroot"
+ if (current_cpu == "x64") {
+ sysroot = "//build/linux/debian_wheezy_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 {
- if (current_cpu == "x64") {
- sysroot = "//build/linux/debian_wheezy_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 {
- # Any other builds don't use a sysroot.
- sysroot = ""
- }
+ # Any other builds don't use a sysroot.
+ sysroot = ""
}
if (sysroot != "") {
« 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