Revert "Don't hardcode output directory in findbugs.py"

build/android/buildbot/bb_host_steps.py

 #!/usr/bin/env python
 # Copyright 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.
 
 import os
 import sys
 
 import bb_utils
 import bb_annotations
@@ skipping 62 matching lines @@
 
 
 def ExtractBuild(options):
   bb_annotations.PrintNamedStep('extract_build')
   RunCmd([os.path.join(SLAVE_SCRIPTS_DIR, 'extract_build.py')]
          + bb_utils.EncodeProperties(options),
          warning_code=1, cwd=DIR_BUILD_ROOT)
 
 
 def FindBugs(options):
-  _ = options # keeps the linter and findbugs happy, parameter is not used
   bb_annotations.PrintNamedStep('findbugs')
-  RunCmd([SrcPath('build', 'android', 'findbugs_diff.py')])
+  build_type = []
+  if options.target == 'Release':
+    build_type = ['--release-build']
+  RunCmd([SrcPath('build', 'android', 'findbugs_diff.py')] + build_type)
   RunCmd([SrcPath(
       'tools', 'android', 'findbugs_plugin', 'test',
-      'run_findbugs_plugin_tests.py')])
+      'run_findbugs_plugin_tests.py')] + build_type)
 
 
 def BisectPerfRegression(options):
   args = []
   if options.extra_src:
     args = ['--extra_src', options.extra_src]
   RunCmd([SrcPath('tools', 'prepare-bisect-perf-regression.py'),
           '-w', os.path.join(constants.DIR_SOURCE_ROOT, os.pardir)])
   RunCmd([SrcPath('tools', 'run-bisect-perf-regression.py'),
           '-w', os.path.join(constants.DIR_SOURCE_ROOT, os.pardir)] + args)
@@ skipping 26 matching lines @@
 
 def main(argv):
   parser = GetHostStepsOptParser()
   options, args = parser.parse_args(argv[1:])
   if args:
     return sys.exit('Unused args %s' % args)
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   setattr(options, 'extra_src',
           options.factory_properties.get('extra_src', ''))
-  constants.SetBuildType(options.target)
 
   if options.steps:
     bb_utils.RunSteps(options.steps.split(','), GetHostStepCmds(), options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))