platform_tools/chromeos/bin/chromeos_make - Issue 17688005: Disable Goma for ChromeOS build

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 17688005: Disable Goma for ChromeOS build (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: Created 7 years, 6 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 | Annotate | Revision Log

OLD	NEW
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 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 # Where the Skia code will pretend to live inside the chroot.	66 # Where the Skia code will pretend to live inside the chroot.

67 SKIA_TOP_DIR="${SCRIPT_DIR}/../../.."	67 SKIA_TOP_DIR="${SCRIPT_DIR}/../../.."

68	68

69 pushd ${CHROMEOS_CHROOT}	69 pushd ${CHROMEOS_CHROOT}

70 cros chrome-sdk --board ${deviceID} --debug -- /bin/sh -c "cd ${SKIA_TOP_DIR}; p latform_tools/chromeos/bin/build_skia_in_chroot ${makeVars}"	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}"

71 returnVal=$?	71 returnVal=$?

72 popd > /dev/null	72 popd > /dev/null

73	73

74 # Clean up	74 # Clean up

75 rm ${CHROMEOS_CHROOT}/.gclient	75 rm ${CHROMEOS_CHROOT}/.gclient

76	76

77 if [ "${returnVal}" != "0" ]	77 if [ "${returnVal}" != "0" ]

78 then	78 then

79 exit 1;	79 exit 1;

80 fi	80 fi

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »