diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2017-10-13 12:57:49 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-13 17:20:37 +0000 |
| commit | 7c1eae5c904e7fe9ade7b53f563bb490831428ac (patch) | |
| tree | d1028bfd50c70a785c6d4cbfe181805b3ea5850e /infra/bots | |
| parent | 3727136ab14ba73b3f0879b3251a9c35de88f49e (diff) | |
Fix asset version detection
Since we went to retrying the adb commands, the return value
got lost, which was used to read the SKP_VERSIOn, etc.
This fixes it.
Bug: skia:
NOTRY=true
Change-Id: Ifc61ec4cbb13a61c571b2fb89a9c0ed215f8fbd3
Reviewed-on: https://skia-review.googlesource.com/59441
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'infra/bots')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_android_flavor.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index 5ac1eca4a6..d4f331369a 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -60,10 +60,10 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): fail_build_on_failure=False) with self.m.context(cwd=self.m.vars.skia_dir): - self.m.run.with_retry(self.m.step, title, attempts, - cmd=[ADB_BINARY]+list(cmd), - between_attempts_fn=wait_for_device, **kwargs) - + return self.m.run.with_retry(self.m.step, title, attempts, + cmd=[ADB_BINARY]+list(cmd), + between_attempts_fn=wait_for_device, + **kwargs) def compile(self, unused_target): compiler = self.m.vars.builder_cfg.get('compiler') configuration = self.m.vars.builder_cfg.get('configuration') |