Commit 6e6200c8 authored by aberent@chromium.org's avatar aberent@chromium.org

Calculate the correct target platform for Android.

The android-chrome-shell browser is an upstream browser, so should
be using a target platform of 'android' not 'android-chrome'.

BUG=394324
NOTRY=true

Review URL: https://codereview.chromium.org/392323002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283567 0039d316-1c4b-4281-b951-d872f2087c98
parent 35bda7b6
...@@ -182,6 +182,7 @@ def _OutputFailedResults(text_to_print): ...@@ -182,6 +182,7 @@ def _OutputFailedResults(text_to_print):
def _CreateBisectOptionsFromConfig(config): def _CreateBisectOptionsFromConfig(config):
print config['command']
opts_dict = {} opts_dict = {}
opts_dict['command'] = config['command'] opts_dict['command'] = config['command']
opts_dict['metric'] = config['metric'] opts_dict['metric'] = config['metric']
...@@ -213,7 +214,9 @@ def _CreateBisectOptionsFromConfig(config): ...@@ -213,7 +214,9 @@ def _CreateBisectOptionsFromConfig(config):
raise RuntimeError('Cros build selected, but BISECT_CROS_IP or' raise RuntimeError('Cros build selected, but BISECT_CROS_IP or'
'BISECT_CROS_BOARD undefined.') 'BISECT_CROS_BOARD undefined.')
elif 'android' in config['command']: 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' opts_dict['target_platform'] = 'android-chrome'
else: else:
opts_dict['target_platform'] = 'android' opts_dict['target_platform'] = 'android'
...@@ -390,7 +393,9 @@ def _RunBisectionScript(config, working_directory, path_to_file, path_to_goma, ...@@ -390,7 +393,9 @@ def _RunBisectionScript(config, working_directory, path_to_file, path_to_goma,
return 1 return 1
if 'android' in config['command']: 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']) cmd.extend(['--target_platform', 'android-chrome'])
else: else:
cmd.extend(['--target_platform', 'android']) cmd.extend(['--target_platform', 'android'])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment