| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """Common steps for recipes that sync/build Cronet sources.""" | 5 """Common steps for recipes that sync/build Cronet sources.""" |
| 6 | 6 |
| 7 from recipe_engine.types import freeze | 7 from recipe_engine.types import freeze |
| 8 from recipe_engine import recipe_api | 8 from recipe_engine import recipe_api |
| 9 | 9 |
| 10 class CronetApi(recipe_api.RecipeApi): | 10 class CronetApi(recipe_api.RecipeApi): |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 recipe_config, | 41 recipe_config, |
| 42 **dict(default_kwargs.items() + kwargs.items())) | 42 **dict(default_kwargs.items() + kwargs.items())) |
| 43 self.m.chromium.apply_config('cronet_builder') | 43 self.m.chromium.apply_config('cronet_builder') |
| 44 for c in chromium_apply_config or []: | 44 for c in chromium_apply_config or []: |
| 45 self.m.chromium.apply_config(c) | 45 self.m.chromium.apply_config(c) |
| 46 self.m.chromium.c.gyp_env.GYP_DEFINES.update(gyp_defs) | 46 self.m.chromium.c.gyp_env.GYP_DEFINES.update(gyp_defs) |
| 47 droid.init_and_sync(use_bot_update=True) | 47 droid.init_and_sync(use_bot_update=True) |
| 48 | 48 |
| 49 | 49 |
| 50 def build(self, use_revision=True, use_goma=True): | 50 def build(self, use_revision=True, use_goma=True): |
| 51 if use_goma: |
| 52 self.m.chromium.ensure_goma() |
| 51 self.m.chromium.runhooks() | 53 self.m.chromium.runhooks() |
| 52 if self.m.chromium.c.project_generator.tool == 'gn': # pragma: no cover | 54 if self.m.chromium.c.project_generator.tool == 'gn': # pragma: no cover |
| 53 assert (self.m.chromium.c.HOST_PLATFORM == 'linux' | 55 assert (self.m.chromium.c.HOST_PLATFORM == 'linux' |
| 54 and self.m.chromium.c.HOST_BITS == 64) | 56 and self.m.chromium.c.HOST_BITS == 64) |
| 55 self.m.chromium.run_gn( | 57 self.m.chromium.run_gn( |
| 56 use_goma=use_goma, | 58 use_goma=use_goma, |
| 57 gn_path=self.m.path['checkout'].join('buildtools', 'linux64', 'gn')) | 59 gn_path=self.m.path['checkout'].join('buildtools', 'linux64', 'gn')) |
| 58 elif self.m.chromium.c.project_generator.tool == 'mb': | 60 elif self.m.chromium.c.project_generator.tool == 'mb': |
| 59 self.m.chromium.run_mb( | 61 self.m.chromium.run_mb( |
| 60 self.m.properties['mastername'], | 62 self.m.properties['mastername'], |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 droid.run_test_suite(suite, shard_timeout=180) | 108 droid.run_test_suite(suite, shard_timeout=180) |
| 107 for suite in instrumentation_tests: | 109 for suite in instrumentation_tests: |
| 108 droid.run_instrumentation_suite( | 110 droid.run_instrumentation_suite( |
| 109 name=suite['target'], | 111 name=suite['target'], |
| 110 verbose=True, | 112 verbose=True, |
| 111 wrapper_script_suite_name=suite['target'], | 113 wrapper_script_suite_name=suite['target'], |
| 112 num_retries=0, | 114 num_retries=0, |
| 113 **suite.get('kwargs', {})) | 115 **suite.get('kwargs', {})) |
| 114 droid.common_tests_final_steps() | 116 droid.common_tests_final_steps() |
| 115 | 117 |
| OLD | NEW |