summaryrefslogtreecommitdiffstats
path: root/build/linux
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 02:32:19 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 02:32:19 +0000
commit8d224864ab1bd9cdd2f02cf930ff7b06f8e264e2 (patch)
treeda3e04a258f41bdf9db20d593b8180fab5817951 /build/linux
parent0a4e5aa5594b7a2e6d056fd9f81bc658a76a21ab (diff)
downloadchromium_src-8d224864ab1bd9cdd2f02cf930ff7b06f8e264e2.zip
chromium_src-8d224864ab1bd9cdd2f02cf930ff7b06f8e264e2.tar.gz
chromium_src-8d224864ab1bd9cdd2f02cf930ff7b06f8e264e2.tar.bz2
Small cleanup in build/linux/install-arm-sysroot.py and fix a typo in DEPS.
NOTRY=true Review URL: https://chromiumcodereview.appspot.com/14647004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
-rwxr-xr-xbuild/linux/install-arm-sysroot.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/build/linux/install-arm-sysroot.py b/build/linux/install-arm-sysroot.py
index ace4084..56be4a57 100755
--- a/build/linux/install-arm-sysroot.py
+++ b/build/linux/install-arm-sysroot.py
@@ -3,7 +3,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# Script to install arm choot image for cross building of arm chrome on linux.
+# Script to install ARM root image for cross building of ARM chrome on linux.
# This script can be run manually but is more often run as part of gclient
# hooks. When run from hooks this script should be a no-op on non-linux
# platforms.
@@ -24,6 +24,7 @@ SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
URL_PREFIX = 'https://commondatastorage.googleapis.com'
URL_PATH = 'nativeclient-archive2/toolchain'
REVISION = 10991
+TARBALL = 'naclsdk_linux_arm-trusted.tgz'
def main(args):
@@ -39,8 +40,7 @@ def main(args):
src_root = os.path.dirname(os.path.dirname(SCRIPT_DIR))
sysroot = os.path.join(src_root, 'arm-sysroot')
- url = "%s/%s/%s/naclsdk_linux_arm-trusted.tgz" % (URL_PREFIX,
- URL_PATH, REVISION)
+ url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION, TARBALL)
stamp = os.path.join(sysroot, ".stamp")
if os.path.exists(stamp):
@@ -53,7 +53,7 @@ def main(args):
if os.path.isdir(sysroot):
shutil.rmtree(sysroot)
os.mkdir(sysroot)
- tarball = os.path.join(sysroot, 'naclsdk_linux_arm-trusted.tgz')
+ tarball = os.path.join(sysroot, TARBALL)
subprocess.check_call(['curl', '-L', url, '-o', tarball])
subprocess.check_call(['tar', 'xf', tarball, '-C', sysroot])
os.remove(tarball)