Calculate the correct target platform for Android.

tools/run-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.
 
 """Run Performance Test Bisect Tool
 
 This script is used by a trybot to run the src/tools/bisect-perf-regression.py
 script with the parameters specified in run-bisect-perf-regression.cfg. It will
 check out a copy of the depot in a subdirectory 'bisect' of the working
@@ skipping 164 matching lines @@
 
 def _OutputFailedResults(text_to_print):
   bisect_utils.OutputAnnotationStepStart('Results - Failed')
   print
   print text_to_print
   print
   bisect_utils.OutputAnnotationStepClosed()
 
 
 def _CreateBisectOptionsFromConfig(config):
+  print config['command']
   opts_dict = {}
   opts_dict['command'] = config['command']
   opts_dict['metric'] = config['metric']
 
   if config['repeat_count']:
     opts_dict['repeat_test_count'] = int(config['repeat_count'])
 
   if config['truncate_percent']:
     opts_dict['truncate_percent'] = int(config['truncate_percent'])
 
@@ skipping 11 matching lines @@
   if '--browser=cros' in config['command']:
     opts_dict['target_platform'] = 'cros'
 
     if os.environ[CROS_BOARD_ENV] and os.environ[CROS_IP_ENV]:
       opts_dict['cros_board'] = os.environ[CROS_BOARD_ENV]
       opts_dict['cros_remote_ip'] = os.environ[CROS_IP_ENV]
     else:
       raise RuntimeError('Cros build selected, but BISECT_CROS_IP or'
           'BISECT_CROS_BOARD undefined.')
   elif 'android' in config['command']:
-    if 'android-chrome' in config['command']:
+    if 'android-chrome-shell' in config['command']:
+      opts_dict['target_platform'] = 'android'
+    elif 'android-chrome' in config['command']:
       opts_dict['target_platform'] = 'android-chrome'
     else:
       opts_dict['target_platform'] = 'android'
 
   return bisect.BisectOptions.FromDict(opts_dict)
 
 
 def _RunPerformanceTest(config, path_to_file):
   # Bisect script expects to be run from src
   os.chdir(os.path.join(path_to_file, '..'))
@@ skipping 156 matching lines @@
     if os.environ[CROS_BOARD_ENV] and os.environ[CROS_IP_ENV]:
       cmd.extend(['--cros_board', os.environ[CROS_BOARD_ENV]])
       cmd.extend(['--cros_remote_ip', os.environ[CROS_IP_ENV]])
     else:
       print 'Error: Cros build selected, but BISECT_CROS_IP or'\
             'BISECT_CROS_BOARD undefined.'
       print
       return 1
 
   if 'android' in config['command']:
-    if 'android-chrome' in config['command']:
+    if 'android-chrome-shell' in config['command']:
+      cmd.extend(['--target_platform', 'android'])
+    elif 'android-chrome' in config['command']:
       cmd.extend(['--target_platform', 'android-chrome'])
     else:
       cmd.extend(['--target_platform', 'android'])
 
   if path_to_goma:
     # crbug.com/330900. For Windows XP platforms, GOMA service is not supported.
     # Moreover we don't compile chrome when gs_bucket flag is set instead
     # use builds archives, therefore ignore GOMA service for Windows XP.
     if config.get('gs_bucket') and platform.release() == 'XP':
       print ('Goma doesn\'t have a win32 binary, therefore it is not supported '
@@ skipping 111 matching lines @@
             opts.path_to_goma)
 
     print 'Error: Could not load config file. Double check your changes to '\
           'run-bisect-perf-regression.cfg/run-perf-test.cfg for syntax errors.'
     print
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())