Skip to content

Commit

Permalink
Add support for installing ARM64 sysroot
Browse files Browse the repository at this point in the history
This change modifies install-sysroot.py to add support for
installing ARM64 sysroot. Also update the jessie arm64 package list.

BUG=613452

Review-Url: https://codereview.chromium.org/2078293002
Cr-Commit-Position: refs/heads/master@{#404323}
  • Loading branch information
apatole authored and Commit bot committed Jul 8, 2016
1 parent f0f8c35 commit ad891a4
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
13 changes: 11 additions & 2 deletions build/linux/sysroot_scripts/install-sysroot.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,26 @@
URL_PATH = 'chrome-linux-sysroot/toolchain'
REVISION_AMD64 = 'c52471d9dec240c8d0a88fa98aa1eefeee32e22f'
REVISION_ARM = 'c52471d9dec240c8d0a88fa98aa1eefeee32e22f'
REVISION_ARM64 = 'bd10c315594d2a20e31a94a7a6c7adb9a0961c56'
REVISION_I386 = 'c52471d9dec240c8d0a88fa98aa1eefeee32e22f'
REVISION_MIPS = 'c52471d9dec240c8d0a88fa98aa1eefeee32e22f'
TARBALL_AMD64 = 'debian_wheezy_amd64_sysroot.tgz'
TARBALL_ARM = 'debian_wheezy_arm_sysroot.tgz'
TARBALL_ARM64 = 'debian_jessie_arm64_sysroot.tgz'
TARBALL_I386 = 'debian_wheezy_i386_sysroot.tgz'
TARBALL_MIPS = 'debian_wheezy_mips_sysroot.tgz'
TARBALL_AMD64_SHA1SUM = 'ca4ed6e7c9e333b046be19d38584a11f6785eea6'
TARBALL_ARM_SHA1SUM = '1fab0c2b1e93a933ddc593df3b43872b0ba5ded2'
TARBALL_ARM64_SHA1SUM = '0db3be51912e0be46bb1b906fc196c5c1dfc090f'
TARBALL_I386_SHA1SUM = '80c48c303319af2284e4a104c882d888af75ba81'
TARBALL_MIPS_SHA1SUM = '01da32a35288627e05cfca193b7f3659531c6f7d'
SYSROOT_DIR_AMD64 = 'debian_wheezy_amd64-sysroot'
SYSROOT_DIR_ARM = 'debian_wheezy_arm-sysroot'
SYSROOT_DIR_ARM64 = 'debian_jessie_arm64-sysroot'
SYSROOT_DIR_I386 = 'debian_wheezy_i386-sysroot'
SYSROOT_DIR_MIPS = 'debian_wheezy_mips-sysroot'

valid_archs = ('arm', 'i386', 'amd64', 'mips')
valid_archs = ('arm', 'arm64', 'i386', 'amd64', 'mips')


class Error(Exception):
Expand Down Expand Up @@ -129,7 +133,7 @@ def InstallDefaultSysroots():
# Don't attampt to install arm64 since this is currently and android-only
# architecture.
target_arch = DetectTargetArch()
if target_arch and target_arch not in (host_arch, 'i386', 'arm64'):
if target_arch and target_arch not in (host_arch, 'i386'):
InstallSysroot(target_arch)


Expand Down Expand Up @@ -170,6 +174,11 @@ def InstallSysroot(target_arch):
tarball_filename = TARBALL_ARM
tarball_sha1sum = TARBALL_ARM_SHA1SUM
revision = REVISION_ARM
elif target_arch == 'arm64':
sysroot = os.path.join(linux_dir, SYSROOT_DIR_ARM64)
tarball_filename = TARBALL_ARM64
tarball_sha1sum = TARBALL_ARM64_SHA1SUM
revision = REVISION_ARM64
elif target_arch == 'i386':
sysroot = os.path.join(linux_dir, SYSROOT_DIR_I386)
tarball_filename = TARBALL_I386
Expand Down
12 changes: 6 additions & 6 deletions build/linux/sysroot_scripts/packagelist.jessie.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ main/e/e2fsprogs/comerr-dev_2.1-1.42.12-1.1_arm64.deb
main/e/e2fsprogs/libcomerr2_1.42.12-1.1_arm64.deb
main/e/elfutils/libelf1_0.159-4.2_arm64.deb
main/e/elfutils/libelf-dev_0.159-4.2_arm64.deb
main/e/expat/libexpat1_2.1.0-6+deb8u1_arm64.deb
main/e/expat/libexpat1-dev_2.1.0-6+deb8u1_arm64.deb
main/e/expat/libexpat1_2.1.0-6+deb8u2_arm64.deb
main/e/expat/libexpat1-dev_2.1.0-6+deb8u2_arm64.deb
main/f/fontconfig/libfontconfig1_2.11.0-6.3_arm64.deb
main/f/fontconfig/libfontconfig1-dev_2.11.0-6.3_arm64.deb
main/f/freetype/libfreetype6_2.5.2-3+deb8u1_arm64.deb
Expand Down Expand Up @@ -86,7 +86,7 @@ main/libp/libpng/libpng12-0_1.2.50-2+deb8u2_arm64.deb
main/libp/libpng/libpng12-dev_1.2.50-2+deb8u2_arm64.deb
main/libp/libpthread-stubs/libpthread-stubs0-dev_0.3-4_arm64.deb
main/libs/libselinux/libselinux1_2.3-2_arm64.deb
main/libt/libtasn1-6/libtasn1-6_4.2-3+deb8u1_arm64.deb
main/libt/libtasn1-6/libtasn1-6_4.2-3+deb8u2_arm64.deb
main/libt/libthai/libthai0_0.1.21-1_arm64.deb
main/libx/libx11/libx11-6_1.6.2-3_arm64.deb
main/libx/libx11/libx11-dev_1.6.2-3_arm64.deb
Expand Down Expand Up @@ -127,7 +127,7 @@ main/libx/libxt/libxt-dev_1.1.4-1+b1_arm64.deb
main/libx/libxtst/libxtst6_1.2.2-1+b1_arm64.deb
main/libx/libxtst/libxtst-dev_1.2.2-1+b1_arm64.deb
main/libx/libxxf86vm/libxxf86vm1_1.1.3-1+b1_arm64.deb
main/l/linux/linux-libc-dev_3.16.7-ckt25-1_arm64.deb
main/l/linux/linux-libc-dev_3.16.7-ckt25-2_arm64.deb
main/m/mesa/libgl1-mesa-dev_10.3.2-1+deb8u1_arm64.deb
main/m/mesa/libgl1-mesa-glx_10.3.2-1+deb8u1_arm64.deb
main/m/mesa/libglapi-mesa_10.3.2-1+deb8u1_arm64.deb
Expand All @@ -138,8 +138,8 @@ main/n/nspr/libnspr4_4.10.7-1+deb8u1_arm64.deb
main/n/nspr/libnspr4-dev_4.10.7-1+deb8u1_arm64.deb
main/n/nss/libnss3_3.17.2-1.1+deb8u2_arm64.deb
main/n/nss/libnss3-dev_3.17.2-1.1+deb8u2_arm64.deb
main/o/openssl/libssl1.0.0_1.0.1k-3+deb8u4_arm64.deb
main/o/openssl/libssl-dev_1.0.1k-3+deb8u4_arm64.deb
main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u2_arm64.deb
main/o/openssl/libssl-dev_1.0.1t-1+deb8u2_arm64.deb
main/o/orbit2/liborbit2_2.14.19-0.3_arm64.deb
main/p/p11-kit/libp11-kit0_0.20.7-1_arm64.deb
main/p/pam/libpam0g_1.1.8-3.1+deb8u1+b1_arm64.deb
Expand Down

0 comments on commit ad891a4

Please sign in to comment.