diff options
Diffstat (limited to 'infra/bots/recipe_modules/vars/api.py')
-rw-r--r-- | infra/bots/recipe_modules/vars/api.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 26bde8c9d8..28589377cd 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -15,12 +15,6 @@ CONFIG_RELEASE = 'Release' class SkiaVarsApi(recipe_api.RecipeApi): - def make_path(self, *path): - """Return a Path object for the given path.""" - key = 'custom_%s' % '_'.join(path) - self.m.path.c.base_paths[key] = tuple(path) - return self.m.path[key] - def setup(self): """Prepare the variables.""" # Setup @@ -59,13 +53,10 @@ class SkiaVarsApi(recipe_api.RecipeApi): if 'Coverage' in self.builder_name and 'Upload' in self.builder_name: self.persistent_checkout = True + self.cache_dir = self.slave_dir.join('cache') if self.persistent_checkout: - if 'Win' in self.builder_name: - self.checkout_root = self.make_path('C:\\', 'b', 'work') - self.gclient_cache = self.make_path('C:\\', 'b', 'cache') - else: - self.checkout_root = self.make_path('/', 'b', 'work') - self.gclient_cache = self.make_path('/', 'b', 'cache') + self.checkout_root = self.cache_dir.join('work') + self.gclient_cache = self.cache_dir.join('git') # got_revision is filled in after checkout steps. self.got_revision = None |