Reland "Skia: Maintain a checkout on swarming (compile) bots"

scripts/slave/recipe_modules/skia/chromeos_flavor.py

 # Copyright 2014 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 default_flavor
 import ssh_flavor
 
 
 """Utils for building for and running tests on ChromeOS."""
@@ skipping 14 matching lines @@
     remote_path = self.device_path_join(self.device_bin_dir, cmd[0])
     self.copy_file_to_device(local_path, remote_path)
     super(ChromeOSFlavorUtils, self).step(name=name,
                                           cmd=[remote_path]+cmd[1:],
                                           **kwargs)
 
   def compile(self, target):
     """Build the given target."""
     # Add depot_tools/third_party/gsutil to PATH.
     env = {'PATH': '%(PATH)s:/home/chrome-bot/depot_tools/third_party/gsutil'}
-    skia_dir = self._skia_api.m.path['checkout']
+    skia_dir = self._skia_api.skia_dir
     cmd = [skia_dir.join('platform_tools', 'chromeos', 'bin', 'chromeos_make'),
            '-d', self.board,
            target]
     self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd,
                        cwd=skia_dir, env=env)
 
   def install(self):
     """Run any device-specific installation steps."""
     self.create_clean_device_dir(self.device_bin_dir)
 
   def get_device_dirs(self):
     """ Set the directories which will be used by the build steps."""
     prefix = self.device_path_join(self.device_root_dir, 'skia_')
     def join(suffix):
       return ''.join((prefix, suffix))
     return default_flavor.DeviceDirs(
         dm_dir=join('dm_out'),  # 'dm' conflicts with the binary
         perf_data_dir=join('perf'),
         resource_dir=join('resources'),
         images_dir=join('images'),
         skp_dir=self.device_path_join(join('skp'), 'skps'),
         tmp_dir=join('tmp_dir'))