scripts/slave/recipe_modules/skia/default_flavor.py - Issue 2154223003: Revert of [Skia] Convert Sk Images to a CIPD package

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/slave/recipe_modules/skia/default_flavor.py

Issue 2154223003: Revert of [Skia] Convert Sk Images to a CIPD package (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « scripts/slave/recipe_modules/skia/api.py ('k') | scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipe_modules/skia/default_flavor.py

diff --git a/scripts/slave/recipe_modules/skia/default_flavor.py b/scripts/slave/recipe_modules/skia/default_flavor.py

index f0cd47c18a791b7093493ebd99d68356c3192be5..2554578bc0464a3687608b4cae5fb3c6c36e5645 100644

--- a/scripts/slave/recipe_modules/skia/default_flavor.py

+++ b/scripts/slave/recipe_modules/skia/default_flavor.py

@@ -212,13 +212,15 @@

run, for example, for Android bots these are paths on the Android device

itself. For desktop bots, these are just local paths.

"""

+ pardir = self._skia_api.m.path.pardir

+ join = self._skia_api.slave_dir.join

return DeviceDirs(

dm_dir=self._skia_api.dm_dir,

perf_data_dir=self._skia_api.perf_data_dir,

resource_dir=self._skia_api.resource_dir,

- images_dir=self._skia_api.images_dir,

+ images_dir=join('images'),

skp_dir=self._skia_api.local_skp_dir,

- tmp_dir=self._skia_api.tmp_dir)

+ tmp_dir=join('tmp'))

def __repr__(self):

return '<%s object>' % self.__class__.__name__ # pragma: no cover