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

Unified Diff: build/config/sysroot.gni

Issue 164773005: Pull GN @ 252040, update calls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: long line Created 6 years, 10 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 | « build/config/linux/BUILD.gn ('k') | build/config/ui.gni » ('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 6340c3a7d197792cb65772af998b9bdffff6491f..cecc1eabfeb2c61bd6eede44f9575fa4b9fb8e61 100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -24,18 +24,17 @@ if (is_android) {
# For official builds, use the sysroot checked into the internal source repo
# so that the builds work on older versions of Linux.
if (cpu_arch == "x64") {
- sysroot = rebase_path(
- "//chrome/installer/linux/debian_wheezy_amd64-sysroot", ".", "")
+ sysroot =
+ rebase_path("//chrome/installer/linux/debian_wheezy_amd64-sysroot")
} else if (cpu_arch == "x86") {
- sysroot = rebase_path(
- "//chrome/installer/linux/debian_wheezy_i386-sysroot", ".", "")
+ sysroot = rebase_path("//chrome/installer/linux/debian_wheezy_i386-sysroot")
} else {
# Any other builds don't use a sysroot.
sysroot = ""
}
} else if (is_linux && !is_chromeos) {
if (cpu_arch == "mipsel") {
- sysroot = rebase_path("//mipsel-sysroot/sysroot", ".", "")
+ sysroot = rebase_path("//mipsel-sysroot/sysroot")
} else {
sysroot = ""
}
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | build/config/ui.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698