| 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 collections | 5 import collections |
| 6 from . import steps | 6 from . import steps |
| 7 | 7 |
| 8 | 8 |
| 9 _builders = collections.defaultdict(dict) | 9 _builders = collections.defaultdict(dict) |
| 10 | 10 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 'testing': { | 33 'testing': { |
| 34 'platform': 'linux' if platform == 'android' else platform, | 34 'platform': 'linux' if platform == 'android' else platform, |
| 35 }, | 35 }, |
| 36 } | 36 } |
| 37 if platform == 'android': | 37 if platform == 'android': |
| 38 spec['android_config'] = 'base_config' | 38 spec['android_config'] = 'base_config' |
| 39 spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm' | 39 spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm' |
| 40 spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android' | 40 spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android' |
| 41 spec['chromium_apply_config'].append('android') | 41 spec['chromium_apply_config'].append('android') |
| 42 spec['gclient_apply_config'].append('android') | 42 spec['gclient_apply_config'].append('android') |
| 43 else: |
| 44 spec['chromium_apply_config'].append('chrome_with_codecs') |
| 43 return spec | 45 return spec |
| 44 | 46 |
| 45 | 47 |
| 46 def BuildSpec(platform, target_bits, build_config='Release', | 48 def BuildSpec(platform, target_bits, build_config='Release', |
| 47 gclient_config='chromium_webrtc'): | 49 gclient_config='chromium_webrtc'): |
| 48 spec = BaseSpec( | 50 spec = BaseSpec( |
| 49 bot_type='builder', | 51 bot_type='builder', |
| 50 chromium_apply_config=['dcheck', 'blink_logging_on'], | 52 chromium_apply_config=['dcheck', 'blink_logging_on'], |
| 51 gclient_config=gclient_config, | 53 gclient_config=gclient_config, |
| 52 platform=platform, | 54 platform=platform, |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 156 |
| 155 AddBuildSpec('Win Builder', 'win', target_bits=32) | 157 AddBuildSpec('Win Builder', 'win', target_bits=32) |
| 156 AddBuildSpec('Mac Builder', 'mac') | 158 AddBuildSpec('Mac Builder', 'mac') |
| 157 AddBuildSpec('Linux Builder', 'linux') | 159 AddBuildSpec('Linux Builder', 'linux') |
| 158 | 160 |
| 159 AddTestSpec('Win7 Tester', 'chromium-webrtc-rel-7', 'win', target_bits=32) | 161 AddTestSpec('Win7 Tester', 'chromium-webrtc-rel-7', 'win', target_bits=32) |
| 160 AddTestSpec('Win8 Tester', 'chromium-webrtc-rel-win8', 'win', target_bits=32) | 162 AddTestSpec('Win8 Tester', 'chromium-webrtc-rel-win8', 'win', target_bits=32) |
| 161 AddTestSpec('Win10 Tester', 'chromium-webrtc-rel-win10', 'win', target_bits=32) | 163 AddTestSpec('Win10 Tester', 'chromium-webrtc-rel-win10', 'win', target_bits=32) |
| 162 AddTestSpec('Mac Tester', 'chromium-webrtc-rel-mac', 'mac') | 164 AddTestSpec('Mac Tester', 'chromium-webrtc-rel-mac', 'mac') |
| 163 AddTestSpec('Linux Tester', 'chromium-webrtc-rel-linux', 'linux') | 165 AddTestSpec('Linux Tester', 'chromium-webrtc-rel-linux', 'linux') |
| OLD | NEW |