[android] Support not passing --adb-path.

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 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.
 
 import contextlib
 import datetime
 import json
 import os
 import pipes
 import re
@@ skipping 722 matching lines @@
         cwd=self.m.path['checkout'],
         env=self.m.chromium.get_env(),
         **kwargs)
 
   def run_sharded_perf_tests(self, config, flaky_config=None, perf_id=None,
                              test_type_transform=lambda x: x,
                              chartjson_file=False, max_battery_temp=None,
                              upload_archives_to_bucket=None,
                              known_devices_file=None,
                              enable_platform_mode=False,
-                             timestamp_as_point_id=False, **kwargs):
+                             timestamp_as_point_id=False,
+                             pass_adb_path=True, **kwargs):
     """Run the perf tests from the given config file.
 
     config: the path of the config file containing perf tests.
     flaky_config: optional file of tests to avoid.
     perf_id: the id of the builder running these tests
     test_type_transform: a lambda transforming the test name to the
       test_type to upload to.
     known_devices_file: Path to file containing serial numbers of known devices.
     enable_platform_mode: If set, will run using the android test runner's new
       platform mode.
     timestamp_as_point_id: If True, will use a unix timestamp as a point_id to
       identify values in the perf dashboard; otherwise the default (commit
       position) is used.
+    pass_adb_path: If True, will pass the configured adb binary to the test
+      runner via --adb-path.
     """
+    # TODO(jbudorick): Remove pass_adb_path once telemetry can use a
+    # configurable adb path.
+
     # test_runner.py actually runs the tests and records the results
     self._run_sharded_tests(config=config, flaky_config=flaky_config,
                             chartjson_output=chartjson_file,
                             max_battery_temp=max_battery_temp,
                             known_devices_file=known_devices_file,
-                            enable_platform_mode=enable_platform_mode, **kwargs)
+                            enable_platform_mode=enable_platform_mode,
+                            pass_adb_path=pass_adb_path, **kwargs)
 
     # now obtain the list of tests that were executed.
     result = self.test_runner(
         'get perf test list',
         ['perf', '--steps', config, '--output-json-list', self.m.json.output(),
          '--blacklist-file', self.blacklist_file],
         step_test_data=lambda: self.m.json.test_api.output([
             {'test': 'perf_test.foo', 'device_affinity': 0,
              'end_time': 1443438432.949711, 'has_archive': True},
             {'test': 'page_cycler.foo', 'device_affinity': 0}]),
@@ skipping 766 matching lines @@
         raise i
       elif (f.result.retcode == EXIT_CODES['warning']):
         w = self.m.step.StepWarning(f.name or f.reason, result=f.result)
         w.result.presentation.status = self.m.step.WARNING
         raise w
       elif (f.result.retcode == EXIT_CODES['error']):
         f.result.presentation.status = self.m.step.FAILURE
       raise
 
   def test_runner(self, step_name, args=None, wrapper_script_suite_name=None,
-                  **kwargs):
+                  pass_adb_path=True, **kwargs):
     """Wrapper for the python testrunner script.
 
     Args:
       step_name: Name of the step.
       args: Testrunner arguments.
     """
     if not args: # pragma: no cover
       args = []
-    args.extend(['--adb-path', self.m.adb.adb_path()])
+    if pass_adb_path:
+      args.extend(['--adb-path', self.m.adb.adb_path()])
     with self.handle_exit_codes():
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)