Make corrections to logcat path for perf bisect jobs.

Bisect bots creates binaries under build/bisect, where as logcat where
searching for binaries and other related file under build/src.
Now we look for files under build/bisect on bisect bots.

BUG=381377
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275494 0039d316-1c4b-4281-b951-d872f2087c98

build/android/buildbot/bb_device_steps.py

@@ -649,6 +649,13 @@ def GetDeviceStepsOptParser():
   parser.add_option(
       '--logcat-dump-output',
       help='The logcat dump output will be "tee"-ed into this file')
+  # During processing perf bisects, a seperate working directory created under
+  # which builds are produced. Therefore we should look for relevent output
+  # file under this directory.(/b/build/slave/<slave_name>/build/bisect/src/out)
+  parser.add_option(
+      '--chrome-output-dir',
+      help='Chrome output directory to be used while bisecting.')
+
   parser.add_option('--disable-stack-tool',  action='store_true',
       help='Do not run stack tool.')
   parser.add_option('--asan-symbolize',  action='store_true',
@@ -668,6 +675,13 @@ def main(argv):
     return sys.exit('Unknown tests %s' % list(unknown_tests))
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
+
+  if options.chrome_output_dir:
+    global CHROME_OUT_DIR
+    global LOGCAT_DIR
+    CHROME_OUT_DIR = options.chrome_output_dir
+    LOGCAT_DIR = os.path.join(CHROME_OUT_DIR, 'logcat')
+
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))

build/android/buildbot/bb_run_bot.py

@@ -123,7 +123,9 @@ def GetBotStepMap():
   flakiness_server = (
       '--flakiness-server=%s' % constants.UPSTREAM_FLAKINESS_SERVER)
   experimental = ['--experimental']
-
+  bisect_chrome_output_dir = os.path.abspath(
+      os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir,
+                   os.pardir, 'bisect', 'src', 'out'))
   B = BotConfig
   H = (lambda steps, extra_args=None, extra_gyp=None, target_arch=None :
        HostConfig('build/android/buildbot/bb_host_steps.py', steps, extra_args,
@@ -168,7 +170,9 @@ def GetBotStepMap():
         H(compile_step),
         T(['gpu'], ['--install=ContentShell'])),
       # Pass empty T([]) so that logcat monitor and device status check are run.
-      B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression']), T([])),
+      B('perf-bisect-builder-tests-dbg',
+        H(['bisect_perf_regression']),
+        T([], ['--chrome-output-dir', bisect_chrome_output_dir])),
       B('perf-tests-rel', H(std_test_steps),
         T([], ['--install=ChromeShell'])),
       B('webkit-latest-webkit-tests', H(std_test_steps),