| Index: gce/uploader_iteration.sh
|
| diff --git a/gce/uploader_iteration.sh b/gce/uploader_iteration.sh
|
| index 6ed43a3a24c4b1c01178abad3b1da23453fa8ce9..9003ea0cc2b7a51837e4b8e838fbfc1629e3b160 100755
|
| --- a/gce/uploader_iteration.sh
|
| +++ b/gce/uploader_iteration.sh
|
| @@ -86,7 +86,9 @@ for REVISION in $REVISION_LIST; do
|
| fi
|
| git reset --hard $REVISION_COMMIT || exit $EXIT_BLINK_UPDATE
|
|
|
| - DEVTOOLS_GYP=$(find . -type f -name devtools.gyp)
|
| + # Exclude "trunk" to work around branches that accidentally have a second
|
| + # copy of Blink sources inside it. See http://crbug.com/450975
|
| + DEVTOOLS_GYP=$(find . -type f -name devtools.gyp -not -path "*/trunk/*")
|
| if [ -z "$DEVTOOLS_GYP" ]; then
|
| exit $EXIT_DEVTOOLS_GYP_FILE
|
| fi
|
|
|