| Index: build/android/buildbot/bb_host_steps.py | 
| diff --git a/build/android/buildbot/bb_host_steps.py b/build/android/buildbot/bb_host_steps.py | 
| index d6f2bae08fd00cd6a7a5dcd21088a6f91bcdde1d..2224bdb5edc2cacf0af4351bd6f1b72ede38b95a 100755 | 
| --- a/build/android/buildbot/bb_host_steps.py | 
| +++ b/build/android/buildbot/bb_host_steps.py | 
| @@ -56,12 +56,11 @@ def Compile(options): | 
| '--compiler=goma', | 
| '--target=%s' % options.target, | 
| '--goma-dir=%s' % bb_utils.GOMA_DIR] | 
| -  build_targets = options.build_targets.split(',') | 
| bb_annotations.PrintNamedStep('compile') | 
| -  for build_target in build_targets: | 
| -    RunCmd(cmd + ['--build-args=%s' % build_target], | 
| -        halt_on_failure=True, | 
| -        cwd=DIR_BUILD_ROOT) | 
| +  if options.build_targets: | 
| +    build_targets = options.build_targets.split(',') | 
| +    cmd += ['--build-args', ' '.join(build_targets)] | 
| +  RunCmd(cmd, halt_on_failure=True, cwd=DIR_BUILD_ROOT) | 
|  | 
|  | 
| def ZipBuild(options): | 
| @@ -112,7 +111,7 @@ def GetHostStepCmds(): | 
| def GetHostStepsOptParser(): | 
| parser = bb_utils.GetParser() | 
| parser.add_option('--steps', help='Comma separated list of host tests.') | 
| -  parser.add_option('--build-targets', default='All', | 
| +  parser.add_option('--build-targets', default='', | 
| help='Comma separated list of build targets.') | 
| parser.add_option('--experimental', action='store_true', | 
| help='Indicate whether to compile experimental targets.') | 
|  |