scripts/slave/recipes/art.py - Issue 1919193002: build: roll infra_paths changes

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/recipes/art.py

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: merge Created 4 years, 8 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/recipes/android/perf.expected/test_failure.json ('k') | scripts/slave/recipes/art.expected/aosp-builder__ON__client.art__clobber.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/art.py

diff --git a/scripts/slave/recipes/art.py b/scripts/slave/recipes/art.py

index 9f49098826c2ef0a9f5fbbb9a6011cb4817a8347..92aca00b0c4f5b7f908625330d62ece5c846b99f 100644

--- a/scripts/slave/recipes/art.py

+++ b/scripts/slave/recipes/art.py

@@ -5,6 +5,7 @@

# TODO: remove redundant DEPS.

DEPS = [

'file',

+ 'depot_tools/infra_paths',

'recipe_engine/path',

'recipe_engine/properties',

'repo',

@@ -55,15 +56,15 @@ def full_checkout(api):

def clobber(api):

# buildbot sets 'clobber' to the empty string which is falsey, check with 'in'

if 'clobber' in api.properties:

- api.file.rmtree('clobber', api.path['slave_build'].join('out'))

+ api.file.rmtree('clobber', api.infra_paths['slave_build'].join('out'))

def setup_host_x86(api, debug, bitness, concurrent_collector=False):

with api.step.defer_results():

checkout(api)

clobber(api)

- build_top_dir = api.path['slave_build']

- art_tools = api.path['slave_build'].join('art', 'tools')

+ build_top_dir = api.infra_paths['slave_build']

+ art_tools = api.infra_paths['slave_build'].join('art', 'tools')

env = { 'TARGET_PRODUCT': 'sdk',

'TARGET_BUILD_VARIANT': 'eng',

'TARGET_BUILD_TYPE': 'release',

@@ -133,8 +134,8 @@ def setup_target(api,

debug,

device,

concurrent_collector=False):

- build_top_dir = api.path['slave_build']

- art_tools = api.path['slave_build'].join('art', 'tools')

+ build_top_dir = api.infra_paths['slave_build']

+ art_tools = api.infra_paths['slave_build'].join('art', 'tools')

android_root = '/data/local/tmp/system'

env = {'TARGET_BUILD_VARIANT': 'eng',