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

Unified Diff: build/common.gypi

Issue 664383004: Merge ARM sysroot install script with existing x86/amd64 one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « android_webview/tools/webview_licenses.py ('k') | build/linux/install-arm-sysroot.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 0ad62ee597ca1d822e84d13ac99d0e0b126abc16..8f9cb381cfe09b36f4bbf64e5e6957d620e4cd05 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -903,7 +903,7 @@
'use_allocator%': 'none',
# sysroot needs to be an absolute path otherwise it generates
# incorrect results when passed to pkg-config
- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
+ 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_arm-sysroot',
}], # OS=="linux" and target_arch=="arm" and chromeos==0
['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0', {
« no previous file with comments | « android_webview/tools/webview_licenses.py ('k') | build/linux/install-arm-sysroot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698