Adding support for ninja.

build/android/buildbot_functions.sh

 #!/bin/bash
 # Copyright (c) 2012 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.
 #
 # Bash functions used by buildbot annotator scripts for the android
 # build of chromium.  Executing this script should not perform actions
 # other than setting variables and defining of functions.
 
 # Number of jobs on the compile line; e.g.  make -j"${JOBS}"
@@ skipping 66 matching lines @@
       echo "Build cannot continue."
       echo "@@@STEP_FAILURE@@@"
       return 1
     fi
   done
 
   if [ ! "$BUILDBOT_CLOBBER" = "" ]; then
     NEED_CLOBBER=1
   fi
 
+  export GYP_GENERATORS=ninja

[Yaron, 2012/08/28 23:38:33]

You only want to set this if you're building for ninja.

[sivachandra, 2012/08/29 16:52:01]

Moved to a more appropriate place in patch set 2.

+
   . build/android/envsetup.sh
 
   if [ "$NEED_CLOBBER" -eq 1 ]; then
     echo "@@@BUILD_STEP Clobber@@@"
     rm -rf "${SRC_ROOT}"/out
     if [ -e "${SRC_ROOT}"/out ] ; then
       echo "Clobber appeared to fail?  ${SRC_ROOT}/out still exists."
       echo "@@@STEP_WARNINGS@@@"
     fi
   fi
@@ skipping 48 matching lines @@
 
 # Stop goma.
 function bb_stop_goma_internal {
   echo "Stopping goma"
   ${GOMA_DIR}/goma_ctl.sh stop
 }
 
 # $@: make args.
 # Use goma if possible; degrades to non-Goma if needed.
 function bb_goma_make {
-  bb_setup_goma_internal
-
   if [ "${GOMA_DIR}" = "" ]; then
     make -j${JOBS} "$@"
     return
   fi
 
-  BUILDTYPE=$(bb_get_json_prop "$FACTORY_PROPERTIES" target)
   HOST_CC=$GOMA_DIR/gcc
   HOST_CXX=$GOMA_DIR/g++
   TARGET_CC=$(/bin/ls $ANDROID_TOOLCHAIN/*-gcc | head -n1)
   TARGET_CXX=$(/bin/ls $ANDROID_TOOLCHAIN/*-g++ | head -n1)
   TARGET_CC="$GOMA_DIR/gomacc $TARGET_CC"
   TARGET_CXX="$GOMA_DIR/gomacc $TARGET_CXX"
   COMMON_JAVAC="$GOMA_DIR/gomacc /usr/bin/javac -J-Xmx512M \
     -target 1.5 -Xmaxerrs 9999999"
 
   command make \
     -j100 \
     -l20 \
     HOST_CC="$HOST_CC" \
     HOST_CXX="$HOST_CXX" \
     TARGET_CC="$TARGET_CC" \
     TARGET_CXX="$TARGET_CXX" \
     CC.host="$HOST_CC" \
     CXX.host="$HOST_CXX" \
     CC.target="$TARGET_CC" \
     CXX.target="$TARGET_CXX" \
     LINK.target="$TARGET_CXX" \
     COMMON_JAVAC="$COMMON_JAVAC" \
     BUILDTYPE="$BUILDTYPE" \
     "$@"
 
   local make_exit_code=$?
-  bb_stop_goma_internal
   return $make_exit_code
 }
 
+# Build using ninja.
+function bb_goma_ninja {
+  echo "Using ninja to build."
+  ninja -C out/$BUILDTYPE -j120 -l20
+}
+
 # Compile step
 function bb_compile {
   # This must be named 'compile', not 'Compile', for CQ interaction.
   # Talk to maruel for details.
   echo "@@@BUILD_STEP compile@@@"
-  bb_goma_make
+
+  BUILDTYPE=$(bb_get_json_prop "$FACTORY_PROPERTIES" target)
+  BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
+
+  bb_setup_goma_internal
+
+  if [ $BUILDTOOL = "ninja" ]; then
+    bb_goma_ninja
+  else
+    bb_goma_make
+  fi
+
+  bb_stop_goma_internal
 }
 
 # Experimental compile step; does not turn the tree red if it fails.
 function bb_compile_experimental {
   # Linking DumpRenderTree appears to hang forever?
   EXPERIMENTAL_TARGETS="android_experimental"
   for target in ${EXPERIMENTAL_TARGETS} ; do
     echo "@@@BUILD_STEP Experimental Compile $target @@@"
     set +e
     bb_goma_make -k "${target}"
@@ skipping 111 matching lines @@
   fi
   return $license_exit_code
   )
 }
 
 # Retrieve a packed json property using python
 function bb_get_json_prop {
   local JSON="$1"
   local PROP="$2"
 
-  python -c "import json; print json.loads('$JSON')['$PROP']"
+  python -c "import json; print json.loads('$JSON').get('$PROP')"
 }