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

Side by Side Diff: platform_tools/chromeos/bin/chromeos_make

Issue 1886573004: Fix ChromeOS Swarming bot compile (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: cleanup Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # This script builds Skia for ChromeOS by mounting the Skia checkout inside a 3 # This script builds Skia for ChromeOS by mounting the Skia checkout inside a
4 # chroot contained within an existing ChromeOS checkout, entering the chroot, 4 # chroot contained within an existing ChromeOS checkout, entering the chroot,
5 # and running the build_skia_in_chroot script. 5 # and running the build_skia_in_chroot script.
6 6
7 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 7 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
8 8
9 if [ $(uname) != "Linux" ]; then 9 if [ $(uname) != "Linux" ]; then
10 echo "ERROR: Can only build for ChromeOS on Linux." 10 echo "ERROR: Can only build for ChromeOS on Linux."
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 pushd "${CHROMEOS_CHROOT}" > /dev/null 56 pushd "${CHROMEOS_CHROOT}" > /dev/null
57 tar -zxvf ${TARBALL} 57 tar -zxvf ${TARBALL}
58 popd > /dev/null 58 popd > /dev/null
59 rm ${CHROMEOS_CHROOT}/${TARBALL} 59 rm ${CHROMEOS_CHROOT}/${TARBALL}
60 fi 60 fi
61 61
62 # Put a fake .gclient file in the toolchain directory so that the cros tool 62 # Put a fake .gclient file in the toolchain directory so that the cros tool
63 # thinks we're in a Chrome checkout. 63 # thinks we're in a Chrome checkout.
64 echo "Delete me!" > "${CHROMEOS_CHROOT}/.gclient" 64 echo "Delete me!" > "${CHROMEOS_CHROOT}/.gclient"
65 65
66 # We may also need a .git directory.
67 GIT_DIR="${CHROMEOS_CHROOT}/src/third_party/chromite/.git"
68 if ! [[ -d "${GIT_DIR}" ]]; then
69 mkdir -p ${GIT_DIR}
70 fi
71
66 # Where the Skia code will pretend to live inside the chroot. 72 # Where the Skia code will pretend to live inside the chroot.
67 SKIA_TOP_DIR="${SCRIPT_DIR}/../../.." 73 SKIA_TOP_DIR="${SCRIPT_DIR}/../../.."
68 74
69 pushd ${CHROMEOS_CHROOT} 75 pushd ${CHROMEOS_CHROOT}
70 cros chrome-sdk --nogoma --board ${deviceID} --debug -- /bin/sh -c "cd ${SKIA_TO P_DIR}; platform_tools/chromeos/bin/build_skia_in_chroot ${makeVars}" 76 cros chrome-sdk --nogoma --board ${deviceID} --debug -- /bin/sh -c "cd ${SKIA_TO P_DIR}; platform_tools/chromeos/bin/build_skia_in_chroot ${makeVars}"
71 popd > /dev/null 77 popd > /dev/null
72 78
73 # Clean up 79 # Clean up
74 rm ${CHROMEOS_CHROOT}/.gclient 80 rm ${CHROMEOS_CHROOT}/.gclient
75 81
76 if [ -f .cros_build_successful ]; then 82 if [ -f .cros_build_successful ]; then
77 rm -rf .cros_build_successful 83 rm -rf .cros_build_successful
78 exit 0 84 exit 0
79 fi 85 fi
80 86
81 exit 1 87 exit 1
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698