DevTools Uploader: migrate to GN

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() {
   echo "$*"
   echo '====================='
 }
 
 unlock_git_repo() {
   local 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 in $1 repo !!!"
     rm -f "$git_index_lock"
   fi
 }
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 mark_step 'Moving to the source code directory'
-SOURCE_DIR=/uploader/src/chrome
+SOURCE_DIR=/uploader/src/chromium/src
 cd "$SOURCE_DIR"
 
 mark_step 'Updating chromium'
 unlock_git_repo Chromium || exit $EXIT_CHROMIUM_UPDATE
 git bisect reset || exit $EXIT_CHROMIUM_UPDATE
 git reset --hard || exit $EXIT_CHROMIUM_UPDATE
 git clean -df || exit $EXIT_CHROMIUM_UPDATE
-git checkout master || exit $EXIT_CHROMIUM_UPDATE
-git pull origin || exit $EXIT_CHROMIUM_UPDATE
-CHROMIUM_GYP_REVISION="$(cat DEPS | $SCRIPT_DIR/uploader_helper.py --find_project_revision='src/tools/gyp')"
-
-mark_step 'Updating gyp'
-pushd tools/gyp
-unlock_git_repo Gyp
-git fetch || exit $EXIT_GYP_UPDATE
-git reset --hard $CHROMIUM_GYP_REVISION || exit $EXIT_GYP_UPDATE
-popd
+git checkout -f master || exit $EXIT_CHROMIUM_UPDATE
+git pull -f origin || exit $EXIT_CHROMIUM_UPDATE
 
 mark_step 'Figuring out the list of branches'
 # Special branches.
 BRANCHES_LIST="master branch-heads/2454 branch-heads/2490"
 # Get a list of branches that were branched after the "first good commit"
 # (post-merge) on master, this is its Cr-Commit-Position:
 AFTER_MERGE_COMMIT_POSITION=350370
 ALL_BRANCHES=$(git branch -r --list 'branch-heads/*')
 for BRANCH in $ALL_BRANCHES; do
     CR_BRANCHED_FROM=$(git log -1 --format=medium "$BRANCH" | grep "^\s*Cr-Branched-From:.*master@{\#[0-9]\+}" | tail -1)
@@ skipping 59 matching lines @@
     mkdir -p $ZIPS_DIR $REVS_DIR $META_DIR $HASH_DIR
 
     if echo "$BLINK_REVISIONS_BLACKLIST" | grep -w $REVISION; then
         echo "Revision $REVISION is in the blacklist, skipping over"
         continue
     fi
 
     echo "Processing $REVISION"
     git reset --hard || exit $EXIT_BLINK_UPDATE
     git clean -df || exit $EXIT_BLINK_UPDATE
-    git checkout $REVISION || exit $EXIT_BLINK_UPDATE
+    git checkout -f $REVISION || exit $EXIT_BLINK_UPDATE
+    gclient sync -D -R || exit $EXIT_BLINK_UPDATE
 
-    # Exclude "trunk" to work around branches that accidentally have a second
-    # copy of Blink sources inside it. See http://crbug.com/450975
-    pushd third_party/WebKit
-    DEVTOOLS_GYP=$(find . -type f -name devtools.gyp -not -path "*/trunk/*")
-    if [ -z "$DEVTOOLS_GYP" ]; then
-        exit $EXIT_DEVTOOLS_GYP_FILE
+    echo "Running GN"
+    if [ -d out/Default ]; then
+        rm -rf out/Default
     fi
-    if [ -d ../../out ]; then
-        rm -rf ../../out
-    fi
-    DEVTOOLS_DIR=$(dirname "$DEVTOOLS_GYP")
-    #TODO: need to calculate depth and output paths based on DEVTOOLS_DIR nesting level
-    GYP_GENERATORS=ninja ../../tools/gyp/gyp --toplevel-dir="$DEVTOOLS_DIR" --depth=../../../.. --generator-output=../../../.. "$DEVTOOLS_GYP" || exit $EXIT_GYP_DEVTOOLS
-    popd
+    mkdir -p out/Default
+    echo "is_debug=false" > out/Default/args.gn
+    gn gen out/Default || exit $EXIT_GYP_DEVTOOLS
 
+    echo "Running ninja"
     LASTCHANGE_FILE="build/util/LASTCHANGE"
     echo "LASTCHANGE=$REVISION" > $LASTCHANGE_FILE
     LASTCHANGE_BLINK_FILE="build/util/LASTCHANGE.blink"
     echo "LASTCHANGE=$REVISION" > $LASTCHANGE_BLINK_FILE
 
     ninja -C out/Default devtools_frontend_resources || exit $EXIT_BUILD_FRONTEND
     ZIP_FILE_NAME=devtools_frontend.zip
     ZIP_FILE=$(pwd)/out/$ZIP_FILE_NAME
 
     pushd out/Default/resources/inspector
+
+    echo "Creating manifest"
     # Create an AppCache manifest and patch devtools.html and / or inspector.html to point to it
     MANIFEST_FILE_NAME=$REVISION.manifest
     FALLBACK_ENTRIES=
     for DEVTOOLS_MAIN_HTML in devtools.html inspector.html; do
         if [ ! -f "$DEVTOOLS_MAIN_HTML" ]; then
             continue
         fi
         sed -i -e 's/^<html>/<html manifest="'$MANIFEST_FILE_NAME'">/' $DEVTOOLS_MAIN_HTML
         FALLBACK_ENTRIES="$FALLBACK_ENTRIES $DEVTOOLS_MAIN_HTML"
     done
     if [ -z "$FALLBACK_ENTRIES" ]; then
         exit $EXIT_MANIFEST_CREATION
     fi
 
     cat <<EOF > $MANIFEST_FILE_NAME
 CACHE MANIFEST
 FALLBACK:
 EOF
     for FALLBACK_ENTRY in $FALLBACK_ENTRIES; do
         echo "$FALLBACK_ENTRY $FALLBACK_ENTRY" >> $MANIFEST_FILE_NAME
     done
     echo "CACHE:" >> $MANIFEST_FILE_NAME
     find -type f -not -name $MANIFEST_FILE_NAME -print | sed -e 's#^\./##' >> $MANIFEST_FILE_NAME
 
+    echo "Creating a zip file"
     zip -9r $ZIP_FILE * || exit $EXIT_ZIP_FRONTEND
 
+    echo "Creating meta and hash files"
     # Copy each file to hash/<sha1>, write <sha1>:<path> to meta file.
     META_FILE_NAME="$META_DIR/@$REVISION"
     for FILE_NAME in $(find -type f); do
         FILE_SHA1=$(sha1sum $FILE_NAME | awk '{print $1}')
         cp $FILE_NAME "$HASH_DIR/$FILE_SHA1"
         echo "$FILE_SHA1:${FILE_NAME##./}" >> $META_FILE_NAME
     done;
 
     popd
 
+    echo "Creating revs file"
     ZIP_SHA1=$(sha1sum $ZIP_FILE | awk '{print $1}')
     mv $ZIP_FILE "$ZIPS_DIR/$ZIP_SHA1.zip"
     echo "$ZIP_SHA1" > "$REVS_DIR/@$REVISION"
 
+    echo "Uploading to storage for revision $REVISION"
     # Comment out the line below for testing.
-    gsutil -m cp -R $LOCAL_STORAGE_DIR/* $GS_PATH || exit $EXIT_CS_UPLOAD
+    gsutil -m cp -n -R $LOCAL_STORAGE_DIR/* $GS_PATH || exit $EXIT_CS_UPLOAD
 done