infra/bots/recipe_modules/flavor/cmake_flavor.py - Issue 2198173002: Re-organize Skia recipes

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: infra/bots/recipe_modules/flavor/cmake_flavor.py

Issue 2198173002: Re-organize Skia recipes (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Fix missing dependency Created 4 years, 4 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:

Index: infra/bots/recipe_modules/flavor/cmake_flavor.py

diff --git a/infra/bots/recipe_modules/skia/cmake_flavor.py b/infra/bots/recipe_modules/flavor/cmake_flavor.py

similarity index 64%

rename from infra/bots/recipe_modules/skia/cmake_flavor.py

rename to infra/bots/recipe_modules/flavor/cmake_flavor.py

index c88d3694512a0d105794ac4a5579baa6195e6173..8b254eceb72e8968f7b3cbd82415a7d7ca57df05 100644

--- a/infra/bots/recipe_modules/skia/cmake_flavor.py

+++ b/infra/bots/recipe_modules/flavor/cmake_flavor.py

@@ -9,6 +9,6 @@ import default_flavor

class CMakeFlavorUtils(default_flavor.DefaultFlavorUtils):

def compile(self, target):

"""Build Skia with CMake. Ignores `target`."""

- cmake_build = self._skia_api.skia_dir.join('cmake', 'cmake_build')

- self._skia_api.run(self._skia_api.m.step, 'cmake_build', cmd=[cmake_build],

- cwd=self._skia_api.m.path['checkout'])

+ cmake_build = self.m.vars.skia_dir.join('cmake', 'cmake_build')

+ self.m.run(self.m.step, 'cmake_build', cmd=[cmake_build],

+ cwd=self.m.path['checkout'])