Fix Swarming compile out dir

infra/bots/common.py

 #!/usr/bin/env python
 #
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import contextlib
 import math
@@ skipping 137 matching lines @@
     self.name = bot_name
     self.skia_dir = os.path.abspath(os.path.join(
         os.path.dirname(os.path.realpath(__file__)),
         os.pardir, os.pardir))
     self.swarm_out_dir = swarm_out_dir
     os.chdir(self.skia_dir)
     self.build_dir = os.path.abspath(os.path.join(self.skia_dir, os.pardir))
     self.spec = self.get_bot_spec(bot_name)
     self.bot_cfg = self.spec['builder_cfg']
     if self.bot_cfg['role'] == 'Build':
-      self.out_dir = os.path.join(swarm_out_dir, 'out')
+      self.out_dir = swarm_out_dir
     else:
       self.out_dir = 'out'
     self.configuration = self.spec['configuration']
     self.default_env = {
       'SKIA_OUT': self.out_dir,
       'BUILDTYPE': self.configuration,
       'PATH': os.environ['PATH'],
     }
     self.default_env.update(self.spec['env'])
     self.build_targets = [str(t) for t in self.spec['build_targets']]
@@ skipping 192 matching lines @@
 
     # See skia:2789.
     if ('Valgrind' in self.name and
         self.builder_cfg.get('cpu_or_gpu') == 'GPU'):
       abandonGpuContext = list(args)
       abandonGpuContext.append('--abandonGpuContext')
       self.flavor.run(abandonGpuContext)
       preAbandonGpuContext = list(args)
       preAbandonGpuContext.append('--preAbandonGpuContext')
       self.flavor.run(preAbandonGpuContext)