Also run builder hack if '/b/build/slave/Android_Builder__dbg_' exists

build/android/buildbot/bb_run_bot.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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 collections
 import copy
 import json
 import os
@@ skipping 267 matching lines @@
   hostname_stdout, hostname_stderr = proc.communicate()
   if proc.returncode == 0:
     print 'Running on: ' + hostname_stdout
   else:
     print >> sys.stderr, 'WARNING: failed to run hostname'
     print >> sys.stderr, hostname_stdout
     print >> sys.stderr, hostname_stderr
     sys.exit(1)
 
   # TODO(phajdan.jr): Remove hack for http://crbug.com/378779 .
-  if hostname_stdout == 'build1-a1.perf.chromium.org':
+  if (hostname_stdout == 'build1-a1.perf.chromium.org' or
+      os.path.exists('/b/build/slave/Android_Builder__dbg_')):
     if os.path.exists('/b/build/slave/Android_Builder__dbg_378779'):
       print '/b/build/slave/Android_Builder__dbg_378779 exists, skipping'
     else:
       print 'CLEANING UP CHECKOUT DIRECTORY HACK SEE http://crbug.com/378779'
       os.rename('/b/build/slave/Android_Builder__dbg_',
                 '/b/build/slave/Android_Builder__dbg_378779')
 
   parser = GetRunBotOptParser()
   options, args = parser.parse_args(argv[1:])
   if args:
     parser.error('Unused args: %s' % args)
 
   bot_config = GetBotConfig(options, GetBotStepMap())
   if not bot_config:
     sys.exit(1)
 
   print 'Using config:', bot_config
 
   commands = GetCommands(options, bot_config)
   for command in commands:
     print 'Will run: ', bb_utils.CommandToString(command)
   print
 
   env = GetEnvironment(bot_config.host_obj, options.testing)
   return RunBotCommands(options, commands, env)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))