Fix ninja build_type for Android builder.

tools/bisect-perf-regression.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 """Performance Test Bisect Tool
 
 This script bisects a series of changelists using binary search. It starts at
 a bad revision where a performance metric has regressed, and asks for a last
 known-good revision. It will then binary search across this revision range by
@@ skipping 636 matching lines @@
       if IsWindows():
         os.environ['GYP_DEFINES'] = 'component=shared_library '\
             'incremental_chrome_dll=1 disable_nacl=1 fastbuild=1 '\
             'chromium_win_pch=0'
   elif build_system == 'make':
     os.environ['GYP_GENERATORS'] = 'make'
   else:
     raise RuntimeError('%s build not supported.' % build_system)
 
 
-def BuildWithMake(threads, targets, build_type):
+def BuildWithMake(threads, targets, build_type='Release'):
   cmd = ['make', 'BUILDTYPE=%s' % build_type]
 
   if threads:
     cmd.append('-j%d' % threads)
 
   cmd += targets
 
   return_code = RunProcess(cmd)
 
   return not return_code
 
 
-def BuildWithNinja(threads, targets, build_type):
+def BuildWithNinja(threads, targets, build_type='Release'):
   cmd = ['ninja', '-C', os.path.join('out', build_type)]
 
   if threads:
     cmd.append('-j%d' % threads)
 
   cmd += targets
 
   return_code = RunProcess(cmd)
 
   return not return_code
 
 
-def BuildWithVisualStudio(targets, build_type):
+def BuildWithVisualStudio(targets, build_type='Release'):

[shatch, 2014/05/15 22:43:52]

Since we're repeating 'Release' all over, should that just go into a global
somewhere?

[prasadv, 2014/05/15 23:14:32]

I think, target_build_type flag is by default set to Release. Before the changes
made by rmcilroy@ default value for build_type was Release in these functions,
therefore I added default value to build_type argument just to be on safeside to
avoid future isssues.
 
On 2014/05/15 22:43:52, shatch wrote:

[shatch, 2014/05/15 23:34:29]

Sorry, I was a bit unclear, more just meant maybe move all these strings to one
spot.

def BuildWithVisualStudio(targets, build_type=TARGET_RELEASE):


It's a minor thing though, feel free to ignore it, still lgtm.

On 2014/05/15 23:14:32, prasadv wrote:

   path_to_devenv = os.path.abspath(
       os.path.join(os.environ['VS100COMNTOOLS'], '..', 'IDE', 'devenv.com'))
   path_to_sln = os.path.join(os.getcwd(), 'chrome', 'chrome.sln')
   cmd = [path_to_devenv, '/build', build_type, path_to_sln]
 
   for t in targets:
     cmd.extend(['/Project', t])
 
   return_code = RunProcess(cmd)
 
@@ skipping 146 matching lines @@
 
     Returns:
         True if build was successful.
     """
     threads = None
     if opts.use_goma:
       threads = 64
 
     build_success = False
     if opts.build_preference == 'ninja':
-      build_success = BuildWithNinja(threads, self._GetTargets())
+      build_success = BuildWithNinja(
+          threads, self._GetTargets(), opts.target_build_type)
     else:
       assert False, 'No build system defined.'
 
     return build_success
 
 
 class AndroidChromeBuilder(AndroidBuilder):
   """AndroidBuilder is used to build on android's chrome."""
   def __init__(self, opts):
     super(AndroidChromeBuilder, self).__init__(opts)
@@ skipping 3043 matching lines @@
       # The perf dashboard scrapes the "results" step in order to comment on
       # bugs. If you change this, please update the perf dashboard as well.
       bisect_utils.OutputAnnotationStepStart('Results')
     print 'Error: %s' % e.message
     if opts.output_buildbot_annotations:
       bisect_utils.OutputAnnotationStepClosed()
   return 1
 
 if __name__ == '__main__':
   sys.exit(main())