Fix regyp on android_test try bot.

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 178 matching lines @@
   # Talk to maruel for details.
   echo "@@@BUILD_STEP compile@@@"
   bb_goma_make
 }
 
 # Re-gyp and compile with unit test bundles configured as shlibs for
 # the native test runner.  Experimental for now.  Once the native test
 # loader is on by default, this entire function becomes obsolete.
 function bb_compile_apk_tests {
   echo "@@@BUILD_STEP Re-gyp for the native test runner@@@"
+  # Setup goma again. Not doing this breaks the android_gyp step.
+  bb_setup_goma_internal

[John Grabowski, 2012/05/25 22:09:32]

This only makes sense to me if somehow goma caches compile flags, and fails to
see when they have changed in the future.

Land, but please contact the goma team.

+
   GYP_DEFINES="$GYP_DEFINES gtest_target_type=shared_library" android_gyp
 
   echo "@@@BUILD_STEP Native test runner compile@@@"
   bb_goma_make
 }
 
 # 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"
@@ skipping 18 matching lines @@
 function bb_run_tests {
   echo "@@@BUILD_STEP Run Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose
 }
 
 # Run APK tests on an actual device.
 function bb_run_apk_tests {
   echo "@@@BUILD_STEP Run APK Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose --apk=True
 }