[chrome-devtools-frontend] Work around presence of superfluous "trunk" dir

gce/uploader_iteration.sh

 #!/bin/bash
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This enables bash to treat any unhandled non-zero exit codes as "exceptions"
 set -e
 source $(dirname $0)/uploader_exit_codes.sh
 
 mark_step() {
@@ skipping 68 matching lines @@
     echo "@$REVISION ==> $REVISION_COMMIT"
     GIT_INDEX_LOCK=".git/index.lock"
     if [ -e "$GIT_INDEX_LOCK" ]; then
         # Can be left over from an interrupted iteration.
         # Safe to remove unless someone is trying to run two iterations in parallel.
         echo "!!! Warning: removing Git index lock !!!"
         rm -f "$GIT_INDEX_LOCK" || exit $EXIT_BLINK_UPDATE
     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
     if [ -d ../devtools-frontend ]; then
         rm -rf ../devtools-frontend
     fi
     DEVTOOLS_DIR=$(dirname "$DEVTOOLS_GYP")
     GYP_GENERATORS=ninja ../gyp/gyp --toplevel-dir="$DEVTOOLS_DIR" --depth=../../../../devtools-frontend --generator-output=../../../../devtools-frontend "$DEVTOOLS_GYP" || exit $EXIT_GYP_DEVTOOLS
     popd
 
@@ skipping 29 matching lines @@
     zip -9r $ZIP_FILE * || exit $EXIT_ZIP_FRONTEND
     popd
 
     ZIP_SHA1=$(sha1sum $ZIP_FILE | awk '{print $1}')
     mv $ZIP_FILE "$ZIPS_DIR/$ZIP_SHA1.zip"
     echo "$ZIP_SHA1" > "$REVS_DIR/@$REVISION"
 
     # Comment out the line below for testing.
     gsutil -m cp -R $LOCAL_STORAGE_DIR/* $GS_PATH || exit $EXIT_CS_UPLOAD
 done