diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-04 22:25:24 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-04 22:25:24 +0000 |
| commit | 34fa388430bbc157290ae4d5d600e3d7c2c7fc97 (patch) | |
| tree | 8e3ead49aa75539e43d9e0395f0c7b5ba62f78f7 /build | |
| parent | 80ae334666f8f50250d7146228c39a2ecd9f5cb1 (diff) | |
| download | chromium_src-34fa388430bbc157290ae4d5d600e3d7c2c7fc97.zip chromium_src-34fa388430bbc157290ae4d5d600e3d7c2c7fc97.tar.gz chromium_src-34fa388430bbc157290ae4d5d600e3d7c2c7fc97.tar.bz2 | |
Update arm sysroot image used by arm/linux builder.
This brings in the new libpcap2 package which was added
to the build script here:
https://codereview.chromium.org/51323006/
Also, remove support for install armel sysroot now that
all the builders are on armhf.
BUG=312380
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/55233006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/linux/install-arm-sysroot.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/build/linux/install-arm-sysroot.py b/build/linux/install-arm-sysroot.py index 5ba4411..76d073e 100755 --- a/build/linux/install-arm-sysroot.py +++ b/build/linux/install-arm-sysroot.py @@ -34,14 +34,9 @@ import sys SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) URL_PREFIX = 'https://commondatastorage.googleapis.com' URL_PATH = 'nativeclient-archive2/toolchain' -REVISION = 12292 +REVISION = 12356 TARBALL = 'sysroot-arm-trusted.tgz' -# TODO(sbc): remove armel support once the transision to armhf -# is complete. -REVISION_ARMEL = 12203 -TARBALL_ARMEL = 'naclsdk_linux_arm-trusted.tgz' - def main(args): if '--linux-only' in args: # This argument is passed when run from the gclient hooks. @@ -55,10 +50,7 @@ def main(args): src_root = os.path.dirname(os.path.dirname(SCRIPT_DIR)) sysroot = os.path.join(src_root, 'arm-sysroot') - if '-gnueabihf-' in os.environ.get('CC', ''): - url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION, TARBALL) - else: - url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION_ARMEL, TARBALL_ARMEL) + url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION, TARBALL) stamp = os.path.join(sysroot, ".stamp") if os.path.exists(stamp): |