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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 'INTERNAL': False, | 46 'INTERNAL': False, |
47 'REPO_NAME': 'src', | 47 'REPO_NAME': 'src', |
48 'BUILD_CONFIG': 'Debug' | 48 'BUILD_CONFIG': 'Debug' |
49 } | 49 } |
50 droid = self.m.chromium_android | 50 droid = self.m.chromium_android |
51 droid.configure_from_properties( | 51 droid.configure_from_properties( |
52 recipe_config, | 52 recipe_config, |
53 **dict(default_kwargs.items() + kwargs.items())) | 53 **dict(default_kwargs.items() + kwargs.items())) |
54 self.m.chromium.apply_config('cronet_builder') | 54 self.m.chromium.apply_config('cronet_builder') |
55 self.m.chromium.c.gyp_env.GYP_DEFINES.update(gyp_defs) | 55 self.m.chromium.c.gyp_env.GYP_DEFINES.update(gyp_defs) |
56 droid.init_and_sync(use_bot_update=False) | 56 droid.init_and_sync(use_bot_update=True) |
57 | 57 |
58 | 58 |
59 def build(self, use_revision=True): | 59 def build(self, use_revision=True): |
60 self.m.chromium.runhooks() | 60 self.m.chromium.runhooks() |
61 if self.m.chromium.c.project_generator.tool == 'mb': | 61 if self.m.chromium.c.project_generator.tool == 'mb': |
62 self.m.chromium.run_mb( | 62 self.m.chromium.run_mb( |
63 self.m.properties['mastername'], | 63 self.m.properties['mastername'], |
64 self.m.properties['buildername']) | 64 self.m.properties['buildername']) |
65 self.m.chromium.compile() | 65 self.m.chromium.compile() |
66 | 66 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 name=suite['test'], | 112 name=suite['test'], |
113 apk_under_test=droid.apk_path(suite.get('apk_under_test')), | 113 apk_under_test=droid.apk_path(suite.get('apk_under_test')), |
114 test_apk=droid.apk_path(suite.get('test_apk')), | 114 test_apk=droid.apk_path(suite.get('test_apk')), |
115 additional_apks=[ | 115 additional_apks=[ |
116 droid.apk_path(a) for a in suite.get('additional_apks') or ()], | 116 droid.apk_path(a) for a in suite.get('additional_apks') or ()], |
117 verbose=True, | 117 verbose=True, |
118 num_retries=0, | 118 num_retries=0, |
119 **suite.get('kwargs', {})) | 119 **suite.get('kwargs', {})) |
120 droid.common_tests_final_steps() | 120 droid.common_tests_final_steps() |
121 | 121 |
OLD | NEW |