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 134 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)

[Isaac (away), 2012/08/29 17:29:05]

Pass these variables as args rather than relying on them getting added to
function's environment.

[sivachandra, 2012/08/29 19:36:49]

I do not really understand you here. Are you saying BUILDTYPE and BUILDTOOL can
be made arguments to bb_compile? I am not sure if this is OK as bb_compile is
invoked from many files. However, I have moved the initialization of these
variables to a different place in patch set 3. PTAL

[Isaac (away), 2012/08/29 19:48:59]

I'm saying bb_goma_ninja and bb_goma make are relying on these variables getting
set and you should pass them as arguments instead of setting them in the
environment.   We want less environment variables and more explicit params.

It's fine to parse them inside of bb_compile.

[sivachandra, 2012/08/29 20:55:36]

OK I get the idea. However, since we need to set GYP_GENERATORS=ninja in
bb_baseline_setup, we will need to parse FACTORY_PROPERTIES in or before
bb_baseline_setup. In this view, is patch set 3 OK?

+
+  bb_setup_goma_internal
+
+  if [ $BUILDTOOL = "ninja" ]; then
+    export GYP_GENERATORS=ninja

[Isaac (away), 2012/08/29 17:29:05]

GYP_GENERATORS needs to be set to ninja before envsetup.  See the email about
building w/ ninja from yaron.

[sivachandra, 2012/08/29 19:36:49]

I have moved it in patch set 3. PTAL

+    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')"
 }