android buildbot: Don't cd into src/ by default.

build/android/buildbot/bb_device_steps.py

Index: build/android/buildbot/bb_device_steps.py
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index f80a2a46b326d5a4aa8f74c019aafb136a37fd3d..3a2fbfa48a4ae60b3076bfbe9e0d1a3d401f61de 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -141,7 +141,7 @@ def RunTestSuites(options, suites):
     cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args
     if suite == 'content_browsertests':
       cmd.append('--num_retries=1')
-    RunCmd(cmd)
+    RunCmd(cmd, cwd=CHROME_SRC_DIR)
 
 
 def RunChromeDriverTests(options):
@@ -153,7 +153,7 @@ def RunChromeDriverTests(options):
            constants.PACKAGE_INFO['chrome_stable'].package,
            constants.PACKAGE_INFO['chrome_beta'].package),
           '--revision=%s' % _GetRevision(options),
-          '--update-log'])
+          '--update-log'], cwd=CHROME_SRC_DIR)
 
 
 def InstallApk(options, test, print_step=False):
@@ -171,7 +171,8 @@ def InstallApk(options, test, print_step=False):
   if options.target == 'Release':
     args.append('--release')
 
-  RunCmd(['build/android/adb_install_apk.py'] + args, halt_on_failure=True)
+  RunCmd(['build/android/adb_install_apk.py'] + args, halt_on_failure=True,
+      cwd=CHROME_SRC_DIR)
 
 
 def RunInstrumentationSuite(options, test, flunk_on_failure=True,
@@ -215,13 +216,13 @@ def RunInstrumentationSuite(options, test, flunk_on_failure=True,
     args.append('--official-build')
 
   RunCmd(['build/android/test_runner.py', 'instrumentation'] + args,
-         flunk_on_failure=flunk_on_failure)
+      flunk_on_failure=flunk_on_failure, cwd=CHROME_SRC_DIR)
 
 
 def RunWebkitLint(target):
   """Lint WebKit's TestExpectation files."""
   bb_annotations.PrintNamedStep('webkit_lint')
-  RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py',
+  RunCmd(['src/webkit/tools/layout_tests/run_webkit_tests.py',
           '--lint-test-files',
           '--chromium',
           '--target', target])
@@ -261,7 +262,7 @@ def RunWebkitLayoutTests(options):
     cmd_args.extend(
         ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)])
 
-  exit_code = RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] +
+  exit_code = RunCmd(['src/webkit/tools/layout_tests/run_webkit_tests.py'] +
                      cmd_args)
   if exit_code == 255: # test_run_results.UNEXPECTED_ERROR_EXIT_STATUS
     bb_annotations.PrintMsg('?? (crashed or hung)')
@@ -393,7 +394,7 @@ def ProvisionDevices(options):
   provision_cmd = ['build/android/provision_devices.py', '-t', options.target]
   if options.auto_reconnect:
     provision_cmd.append('--auto-reconnect')
-  RunCmd(provision_cmd)
+  RunCmd(provision_cmd, cwd=CHROME_SRC_DIR)
 
 
 def DeviceStatusCheck(options):
@@ -441,11 +442,11 @@ def RunGPUTests(options):
   # (crbug.com/285932)
 
   # bb_annotations.PrintNamedStep('gpu_tests')
-  # RunCmd(['content/test/gpu/run_gpu_test',
+  # RunCmd(['src/content/test/gpu/run_gpu_test',
   #         '--browser=android-content-shell', 'pixel'])
 
   bb_annotations.PrintNamedStep('webgl_conformance_tests')
-  RunCmd(['content/test/gpu/run_gpu_test',
+  RunCmd(['src/content/test/gpu/run_gpu_test',
           '--browser=android-content-shell', 'webgl_conformance',
           '--webgl-conformance-version=1.0.1'])
 
@@ -480,7 +481,8 @@ def UploadHTML(options, gs_base_dir, dir_to_upload, link_text,
   bot_id = options.build_properties.get('buildername', 'testing')
   randhash = hashlib.sha1(str(random.random())).hexdigest()
   gs_path = '%s/%s/%s/%s' % (gs_base_dir, bot_id, revision, randhash)
-  RunCmd([bb_utils.GSUTIL_PATH, 'cp', '-R', dir_to_upload, 'gs://%s' % gs_path])
+  RunCmd([bb_utils.GSUTIL_PATH, 'cp', '-R', dir_to_upload, 'gs://%s' % gs_path],
+         cwd=CHROME_SRC_DIR)
   bb_annotations.PrintLink(link_text,
                            '%s/%s/%s' % (gs_url, gs_path, link_rel_path))
 
@@ -494,7 +496,8 @@ def GenerateJavaCoverageReport(options):
           '--coverage-dir', options.coverage_dir,
           '--metadata-dir', os.path.join(CHROME_OUT_DIR, options.target),
           '--cleanup',
-          '--output', os.path.join(coverage_html, 'index.html')])
+          '--output', os.path.join(coverage_html, 'index.html')],
+         cwd=CHROME_SRC_DIR)
   return coverage_html
 
 
@@ -506,7 +509,8 @@ def LogcatDump(options):
     RunCmd([
         os.path.join(CHROME_SRC_DIR, 'build', 'android',
                      'adb_logcat_printer.py'),
-        LOGCAT_DIR], stdout=f)
+        LOGCAT_DIR], stdout=f,
+         cwd=CHROME_SRC_DIR)
   RunCmd(['cat', logcat_file])