Enable manual bisects on Chrome for Android.

tools/run-bisect-manual-test.py

Index: tools/run-bisect-manual-test.py
diff --git a/tools/run-bisect-manual-test.py b/tools/run-bisect-manual-test.py
index 6a2e4ffc3c19e360e6213c2e90200e01612451d0..aa6397432a07532e61c46a222720f82c91253c43 100755
--- a/tools/run-bisect-manual-test.py
+++ b/tools/run-bisect-manual-test.py
@@ -48,11 +48,13 @@ def _RunBisectionScript(options):
          '-m', 'manual_test/manual_test',
          '-r', '1',
          '--working_directory', options.working_directory,
-         '--target_build_type', options.browser_type.title(),
          '--build_preference', 'ninja',
          '--use_goma',
          '--no_custom_deps']
 
+  if options.extra_src:
+    cmd.extend(['--extra_src', options.extra_src])
+
   if 'cros' in options.browser_type:
     cmd.extend(['--target_platform', 'cros'])
 
@@ -64,8 +66,16 @@ def _RunBisectionScript(options):
             'BISECT_CROS_BOARD undefined.'
       print
       return 1
+  elif 'android-chrome' in options.browser_type:
+    cmd.extend(['--target_platform', 'android-chrome'])
   elif 'android' in options.browser_type:
     cmd.extend(['--target_platform', 'android'])
+  elif not options.target_build_type:
+    cmd.extend(['--target_build_type', options.browser_type.title()])

[rmcilroy, 2014/06/13 14:04:21]

I don't think these two lines are required - target_build_type should always be
set (by default to "Release" on line 122) not explicitly set by the user, right?
 Also, if this is needed, should it be an "elif" here, since that means it
doesn't get executed for android or android-chrome target platforms?

Just wondering - is there a reason why you need to set target_build_type
differently from options.browser_type.title() ?  

[aberent, 2014/06/13 14:37:36]

Because if, for example, browser-type is android-chrome (which is what is used
for Clank), then title is Android-Chrome, yet the build type should still be
either Release or Debug, corresponding to the build subdirectories.

I was including this to attempt to keep compatibility with the old code, but, as
you say, because target_build_type has a default it will never be used. I will
take out the default.

The elif is definitely needed, we never want to set target_build_type to
Android-Chrome or Android (or Cros).

On 2014/06/13 14:04:21, rmcilroy wrote:

+
+  if options.target_build_type:
+    cmd.extend(['--target_build_type', options.target_build_type])
+
 
   cmd = [str(c) for c in cmd]
 
@@ -102,7 +112,16 @@ def main():
                     help='A working directory to supply to the bisection '
                     'script, which will use it as the location to checkout '
                     'a copy of the chromium depot.')
-
+  parser.add_option('--extra_src',
+                    type='str',
+                    help='Path to extra source file. If this is supplied, '
+                    'bisect script will use this to override default behavior.')
+  parser.add_option('--target_build_type',
+                     type='choice',
+                     choices=['Release', 'Debug'],
+                     default='Release',

[rmcilroy, 2014/06/13 14:04:21]

Maybe we shouldn't have a default here and instead just rely on the value of
options.browser_type.title() as the default if the user doesn't set it
explicitly?

[aberent, 2014/06/13 14:37:36]

Yes. See above.

[aberent, 2014/06/17 13:28:17]

Done.

+                     help='The target build type. Choices are "Release" '
+                     '(default), or "Debug".')
   options, args = parser.parse_args()
   error_msg = ''
   if not options.good_revision: