diff options
author | 2018-06-01 11:53:42 +0000 | |
---|---|---|
committer | 2018-06-01 11:53:46 +0000 | |
commit | fbe7166685b860a530ebe545aef5596c6a86c403 (patch) | |
tree | 794a46b6d3b643ccdbac3d719155dedb38101cd0 /infra/bots/recipes/compile.py | |
parent | 0c9d2805e81e15e3afdf7ebcdc030771dbe7750b (diff) |
Revert "[recipes] Isolate build outputs with no subdirs"
This reverts commit 0c9d2805e81e15e3afdf7ebcdc030771dbe7750b.
Reason for revert: Broke iOS and SwiftShader (and maybe others)
Original change's description:
> [recipes] Isolate build outputs with no subdirs
>
> Bug: skia:6473
> Change-Id: If243b6afb748529d2bdb212e360cd4338edc929c
> Reviewed-on: https://skia-review.googlesource.com/130942
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
TBR=borenet@google.com,benjaminwagner@google.com
Change-Id: Icf9490f2f88dc454c6d971f35258e219137b0c0e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6473
Reviewed-on: https://skia-review.googlesource.com/131400
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes/compile.py')
-rw-r--r-- | infra/bots/recipes/compile.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py index cea7af4648..9a2e0f6b23 100644 --- a/infra/bots/recipes/compile.py +++ b/infra/bots/recipes/compile.py @@ -69,14 +69,16 @@ def RunSteps(api): api.build(checkout_root=checkout_root, out_dir=out_dir) # TODO(borenet): Move this out of the try/finally. - dst = api.vars.swarming_out_dir + dst = api.vars.swarming_out_dir.join('out', api.vars.configuration) if 'ParentRevision' in api.vars.builder_name: - dst = api.vars.swarming_out_dir.join('ParentRevision') + dst = api.vars.swarming_out_dir.join( + 'ParentRevision', 'out', api.vars.configuration) api.build.copy_build_products(out_dir=out_dir, dst=dst) if 'SKQP' in api.vars.extra_tokens: wlist = checkout_root.join( 'skia', 'infra','cts', 'whitelist_devices.json') api.file.copy('copy whitelist', wlist, dst) + finally: if 'Win' in api.vars.builder_cfg.get('os', ''): api.python.inline( |