diff options
| author |  Eric Boren <borenet@google.com> | 2018-06-01 11:53:42 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-01 11:53:46 +0000 |
| commit | fbe7166685b860a530ebe545aef5596c6a86c403 (patch) | |
| tree | 794a46b6d3b643ccdbac3d719155dedb38101cd0 /infra/bots/recipe_modules/flavor/chromebook.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/recipe_modules/flavor/chromebook.py')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/chromebook.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/infra/bots/recipe_modules/flavor/chromebook.py b/infra/bots/recipe_modules/flavor/chromebook.py index 348f9423a8..eb745d3972 100644 --- a/infra/bots/recipe_modules/flavor/chromebook.py +++ b/infra/bots/recipe_modules/flavor/chromebook.py @@ -122,7 +122,7 @@ class ChromebookFlavor(default.DefaultFlavor): if name == 'nanobench': self.create_clean_host_dir(self.host_dirs.perf_data_dir) - app = self.host_dirs.bin_dir.join(cmd[0]) + app = self.m.vars.skia_out.join(cmd[0]) cmd[0] = '%s/%s' % (self.device_dirs.bin_dir, cmd[0]) self.copy_file_to_device(app, cmd[0]) |