Fix findbugs failure on Release buildtype.

build/android/buildbot/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}"
 JOBS="${JOBS:-4}"
 
 # Parse named arguments passed into the annotator script
 # and assign them global variable names.
 function bb_parse_args {
   while [[ $1 ]]; do
     case "$1" in
       --factory-properties=*)
         FACTORY_PROPERTIES="$(echo "$1" | sed 's/^[^=]*=//')"
         BUILDTYPE=$(bb_get_json_prop "$FACTORY_PROPERTIES" target)
-        if [[ $BUILDTYPE = Release ]]; then
-          BUILDFLAG="--release"
-        fi
         ;;
       --build-properties=*)
         BUILD_PROPERTIES="$(echo "$1" | sed 's/^[^=]*=//')"
         ;;
       *)
         echo "@@@STEP_WARNINGS@@@"
         echo "Warning, unparsed input argument: '$1'"
         ;;
     esac
     shift
@@ skipping 172 matching lines @@
   python build/android/adb_logcat_printer.py "$LOGCAT_DUMP_DIR"
 }
 
 # Run tests on an actual device.  (Better have one plugged in!)
 function bb_run_unit_tests {
   build/android/run_tests.py --xvfb --verbose
 }
 
 # Run WebKit's test suites: webkit_unit_tests and TestWebKitAPI
 function bb_run_webkit_unit_tests {
+  if [[ $BUILDTYPE = Release ]]; then
+    local BUILDFLAG="--release"
+  fi
   build/android/run_tests.py --xvfb --verbose $BUILDFLAG -s webkit_unit_tests
   build/android/run_tests.py --xvfb --verbose $BUILDFLAG -s TestWebKitAPI
 }
 
 # Lint WebKit's TestExpectation files.
 function bb_lint_webkit_expectation_files {
   echo "@@@BUILD_STEP webkit_lint@@@"
   bb_run_step python webkit/tools/layout_tests/run_webkit_tests.py \
     --lint-test-files \
     --chromium
@@ skipping 25 matching lines @@
       --platform=chromium-android \
       --test-results-server "$RESULTSERVER"
 }
 
 # Run experimental unittest bundles.
 function bb_run_experimental_unit_tests {
   build/android/run_tests.py --xvfb --verbose -s android_webview_unittests
 }
 
 # Run findbugs.
-function bb_run_findbugs_diff {
-  echo "@@@BUILD_STEP findbugs_diff@@@"
-  build/android/findbugs_diff.py
+function bb_run_findbugs {
+  echo "@@@BUILD_STEP findbugs@@@"
+  if [[ $BUILDTYPE = Release ]]; then
+    local BUILDFLAG="--release-build"
+  fi
+  bb_run_step build/android/findbugs_diff.py $BUILDFLAG
+  bb_run_step tools/android/findbugs_plugin/test/run_findbugs_plugin_tests.py \
+    $BUILDFLAG
 }
 
-# Run findbugs plugin tests.
-function bb_run_findbugs_plugin_tests {
-  echo "@@@BUILD_STEP findbugs_plugin_tests@@@"
-  tools/android/findbugs_plugin/test/run_findbugs_plugin_tests.py
-}
-
-# Run a buildbot step and handle failure.
+# Run a buildbot step and handle failure (failure will not halt build).
 function bb_run_step {
   (
   set +e
   "$@"
   if [[ $? != 0 ]]; then
     echo "@@@STEP_FAILURE@@@"
   fi
   )
 }
 
@@ skipping 93 matching lines @@
   )
 }
 
 # 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').get('$PROP', '')"
 }