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/recipe_modules/flavor/android.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/android.py')
-rw-r--r-- | infra/bots/recipe_modules/flavor/android.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py index 32175de1f3..ea93cb451c 100644 --- a/infra/bots/recipe_modules/flavor/android.py +++ b/infra/bots/recipe_modules/flavor/android.py @@ -446,7 +446,7 @@ wait_for_device() line = line.replace(addr, addr + ' ' + sym.strip()) print line """ % self.ADB_BINARY, - args=[self.host_dirs.bin_dir], + args=[self.m.vars.skia_out], infra_step=True, timeout=300, abort_on_failure=False) @@ -472,7 +472,7 @@ wait_for_device() self._scale_for_nanobench() else: self._scale_for_dm() - app = self.host_dirs.bin_dir.join(cmd[0]) + app = self.m.vars.skia_out.join(cmd[0]) self._adb('push %s' % cmd[0], 'push', app, self.device_dirs.bin_dir) |