diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 08:31:23 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 08:31:23 +0000 |
| commit | c88c7d80724f5e04250aa70dcf2aa0e27d1889dd (patch) | |
| tree | e8745f3e173b62fa107e897b127f9b1d5ed86e15 | |
| parent | 45c92d82e9d6dbb975280e037bf83cce088c7d64 (diff) | |
| download | chromium_src-c88c7d80724f5e04250aa70dcf2aa0e27d1889dd.zip chromium_src-c88c7d80724f5e04250aa70dcf2aa0e27d1889dd.tar.gz chromium_src-c88c7d80724f5e04250aa70dcf2aa0e27d1889dd.tar.bz2 | |
Teach "install-build-deps.sh --arm" how to install the arm root image.
The --arm argument will already install the arm cross
toolchain, but building chrome/arm also requires an
arm sysroot. The script will now download the sysroot
to out/arm_root.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11417041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171448 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | build/install-build-deps.sh | 36 |
2 files changed, 37 insertions, 0 deletions
@@ -40,6 +40,7 @@ Thumbs.db v8.log /Makefile /_out +/arm-sysroot /ash/resources/google_wallpapers/ /breakpad/src/ /build/Debug diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index 730c0d1..1fabb9c 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -250,6 +250,42 @@ else exit 100 fi +# Install arm root image +if test "$do_inst_arm" = "1"; then + # As well as the arm toolchain packages we also need a recent arm root + # image to build against (using --sysroot). We could construct this + # from scratch based on the current state or precise/arm but for + # consistency we currently use a pre-built root image which was constructed + # for building trusted NaCl code. + CHROME_ROOT="$(dirname ${BASH_SOURCE[0]})" + CHROME_ROOT="$(dirname ${CHROME_ROOT})" + SYSROOT="${CHROME_ROOT}/arm-sysroot" + TC_URL_PREFIX=https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain + TC_REV=8001 + TC_URL=${TC_URL_PREFIX}/${TC_REV}/naclsdk_linux_arm-trusted.tgz + + INSTALL_ROOT="yes" + STAMP="${SYSROOT}/.stamp" + if [ -f "${STAMP}" ]; then + if [ "${TC_URL}" = $(cat ${STAMP}) ]; then + INSTALL_ROOT="no" + fi + fi + + if [ $INSTALL_ROOT = "no" ]; then + echo "ARM root image already up-to-date." + else + echo "Installing ARM root image." + mkdir -p ${SYSROOT} + tarball=${SYSROOT}/naclsdk_linux_arm-trusted.tgz + set -x + curl -L ${TC_URL} -o ${tarball} + tar xf ${tarball} -C ${SYSROOT} + rm ${tarball} + echo -n "${TC_URL}" > "${STAMP}" + fi +fi + # Install 32bit backwards compatibility support for 64bit systems if [ "$(uname -m)" = "x86_64" ]; then if test "$do_inst_lib32" != "1" |