| 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 29 matching lines...) Expand all Loading... |
| 40 'INTERNAL': False, | 40 'INTERNAL': False, |
| 41 'REPO_NAME': 'src', | 41 'REPO_NAME': 'src', |
| 42 'BUILD_CONFIG': 'Debug' | 42 'BUILD_CONFIG': 'Debug' |
| 43 } | 43 } |
| 44 droid = self.m.chromium_android | 44 droid = self.m.chromium_android |
| 45 droid.configure_from_properties( | 45 droid.configure_from_properties( |
| 46 recipe_config, | 46 recipe_config, |
| 47 **dict(default_kwargs.items() + kwargs.items())) | 47 **dict(default_kwargs.items() + kwargs.items())) |
| 48 self.m.chromium.apply_config('cronet_builder') | 48 self.m.chromium.apply_config('cronet_builder') |
| 49 self.m.chromium.c.gyp_env.GYP_DEFINES.update(gyp_defs) | 49 self.m.chromium.c.gyp_env.GYP_DEFINES.update(gyp_defs) |
| 50 droid.init_and_sync() | 50 droid.init_and_sync(use_bot_update=False) |
| 51 | 51 |
| 52 | 52 |
| 53 def build(self, use_revision=True): | 53 def build(self, use_revision=True): |
| 54 self.m.chromium.runhooks() | 54 self.m.chromium.runhooks() |
| 55 self.m.chromium.compile() | 55 self.m.chromium.compile() |
| 56 | 56 |
| 57 | 57 |
| 58 def get_version(self): | 58 def get_version(self): |
| 59 version = self.m.chromium.get_version() | 59 version = self.m.chromium.get_version() |
| 60 return "%s.%s.%s.%s" % (version['MAJOR'], version['MINOR'], | 60 return "%s.%s.%s.%s" % (version['MAJOR'], version['MINOR'], |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 droid.run_test_suite(suite, shard_timeout=180) | 99 droid.run_test_suite(suite, shard_timeout=180) |
| 100 for suite in instrumentation_tests: | 100 for suite in instrumentation_tests: |
| 101 droid.run_instrumentation_suite( | 101 droid.run_instrumentation_suite( |
| 102 name=suite['test'], | 102 name=suite['test'], |
| 103 apk_under_test=droid.apk_path(suite.get('apk_under_test')), | 103 apk_under_test=droid.apk_path(suite.get('apk_under_test')), |
| 104 test_apk=droid.apk_path(suite.get('test_apk')), | 104 test_apk=droid.apk_path(suite.get('test_apk')), |
| 105 verbose=True, | 105 verbose=True, |
| 106 **suite.get('kwargs', {})) | 106 **suite.get('kwargs', {})) |
| 107 droid.common_tests_final_steps() | 107 droid.common_tests_final_steps() |
| 108 | 108 |
| OLD | NEW |