scripts/slave/recipe_modules/skia/cmake_flavor.py - Issue 1917243002: Revert "build: roll infra_paths changes"

Side by Side Diff

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

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

Side by Side Diff: scripts/slave/recipe_modules/skia/cmake_flavor.py

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

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

OLD	NEW
1 # Copyright 2015 The Chromium Authors. All rights reserved.	1 # Copyright 2015 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 import default_flavor	5 import default_flavor

6	6

7 """CMake flavor utils, used for building Skia with CMake."""	7 """CMake flavor utils, used for building Skia with CMake."""

8	8

9 class CMakeFlavorUtils(default_flavor.DefaultFlavorUtils):	9 class CMakeFlavorUtils(default_flavor.DefaultFlavorUtils):

10 def compile(self, target):	10 def compile(self, target):

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

12 cmake_build = self._skia_api.m.infra_paths['slave_build'].join(	12 cmake_build = self._skia_api.m.path['slave_build'].join(

13 'skia', 'cmake', 'cmake_build')	13 'skia', 'cmake', 'cmake_build')

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

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

OLD	NEW