diff options
| author |  Eric Boren <borenet@google.com> | 2018-05-31 09:21:40 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-01 11:45:15 +0000 |
| commit | 0c9d2805e81e15e3afdf7ebcdc030771dbe7750b (patch) | |
| tree | 64c95181dbe990db2c15dedd948c08ecb4b22ba1 /infra/bots/recipes/compile.py | |
| parent | c4952be7d401797aa6c353b57bf97132bf3d7669 (diff) | |
[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>
Diffstat (limited to 'infra/bots/recipes/compile.py')
| -rw-r--r-- | infra/bots/recipes/compile.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py index 9a2e0f6b23..cea7af4648 100644 --- a/infra/bots/recipes/compile.py +++ b/infra/bots/recipes/compile.py @@ -69,16 +69,14 @@ 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.join('out', api.vars.configuration) + dst = api.vars.swarming_out_dir if 'ParentRevision' in api.vars.builder_name: - dst = api.vars.swarming_out_dir.join( - 'ParentRevision', 'out', api.vars.configuration) + dst = api.vars.swarming_out_dir.join('ParentRevision') 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( |