| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 import copy | 5 import copy |
| 6 | 6 |
| 7 from recipe_engine import recipe_api | 7 from recipe_engine import recipe_api |
| 8 | 8 |
| 9 | 9 |
| 10 class iOSApi(recipe_api.RecipeApi): | 10 class iOSApi(recipe_api.RecipeApi): |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 step_result.json.output['Mac OS X Version'], | 33 step_result.json.output['Mac OS X Version'], |
| 34 step_result.json.output['Xcode Version'], | 34 step_result.json.output['Xcode Version'], |
| 35 step_result.json.output['Xcode Build Version'], | 35 step_result.json.output['Xcode Build Version'], |
| 36 ) | 36 ) |
| 37 return step_result | 37 return step_result |
| 38 | 38 |
| 39 def checkout(self, **kwargs): | 39 def checkout(self, **kwargs): |
| 40 """Checks out Chromium.""" | 40 """Checks out Chromium.""" |
| 41 kwargs.setdefault('force', True) | 41 kwargs.setdefault('force', True) |
| 42 self.m.gclient.set_config('ios') | 42 self.m.gclient.set_config('ios') |
| 43 update_step = self.m.bot_update.ensure_checkout(**kwargs) | 43 |
| 44 self.m.path['checkout'] = self.m.path['slave_build'].join('src') | 44 checkout_dir = self.m.chromium_tests.get_checkout_dir({}) |
| 45 return update_step | 45 if checkout_dir: |
| 46 kwargs.setdefault('cwd', checkout_dir) |
| 47 |
| 48 return self.m.bot_update.ensure_checkout(**kwargs) |
| 46 | 49 |
| 47 @property | 50 @property |
| 48 def compiler(self): | 51 def compiler(self): |
| 49 assert self.__config is not None | 52 assert self.__config is not None |
| 50 return self.__config['compiler'] | 53 return self.__config['compiler'] |
| 51 | 54 |
| 52 @property | 55 @property |
| 53 def configuration(self): | 56 def configuration(self): |
| 54 assert self.__config is not None | 57 assert self.__config is not None |
| 55 return self.__config['configuration'] | 58 return self.__config['configuration'] |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 760 self.configuration, | 763 self.configuration, |
| 761 'iossim', | 764 'iossim', |
| 762 ), | 765 ), |
| 763 'ninja': self.m.path.join( | 766 'ninja': self.m.path.join( |
| 764 'src', | 767 'src', |
| 765 build_dir, | 768 build_dir, |
| 766 '%s-%s' % (self.configuration, platform), | 769 '%s-%s' % (self.configuration, platform), |
| 767 'iossim', | 770 'iossim', |
| 768 ), | 771 ), |
| 769 }[self.compiler] | 772 }[self.compiler] |
| OLD | NEW |