Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: scripts/slave/recipe_modules/webrtc/chromium_config.py

Issue 573673002: WebRTC: Pin SDK version to 10.9 for Mac and iOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 from slave.recipe_config import BadConf 5 from slave.recipe_config import BadConf
6 6
7 from RECIPE_MODULES.chromium import CONFIG_CTX 7 from RECIPE_MODULES.chromium import CONFIG_CTX
8 from slave.recipe_config_types import Path 8 from slave.recipe_config_types import Path
9 9
10 10
11 SUPPORTED_TARGET_ARCHS = ('intel', 'arm') 11 SUPPORTED_TARGET_ARCHS = ('intel', 'arm')
12 12
13 13
14 @CONFIG_CTX(includes=['chromium']) 14 @CONFIG_CTX(includes=['chromium'])
15 def webrtc(c): 15 def webrtc(c):
16 c.compile_py.default_targets = ['All'] 16 c.compile_py.default_targets = ['All']
17 17
18 c.runtests.memory_tests_runner = Path('[CHECKOUT]', 'tools', 18 c.runtests.memory_tests_runner = Path('[CHECKOUT]', 'tools',
19 'valgrind-webrtc', 'webrtc_tests', 19 'valgrind-webrtc', 'webrtc_tests',
20 platform_ext={'win': '.bat', 20 platform_ext={'win': '.bat',
21 'mac': '.sh', 21 'mac': '.sh',
22 'linux': '.sh'}) 22 'linux': '.sh'})
23 if c.TARGET_PLATFORM == 'mac' and c.TARGET_BITS == 64: 23 if c.TARGET_PLATFORM == 'mac':
24 c.gyp_env.GYP_DEFINES['mac_sdk'] = '10.7' 24 c.gyp_env.GYP_DEFINES['mac_sdk'] = '10.9'
25 25
26 @CONFIG_CTX(includes=['chromium_clang']) 26 @CONFIG_CTX(includes=['chromium_clang'])
27 def webrtc_clang(c): 27 def webrtc_clang(c):
28 c.compile_py.default_targets = ['All'] 28 c.compile_py.default_targets = ['All']
29 29
30 @CONFIG_CTX(includes=['webrtc_clang']) 30 @CONFIG_CTX(includes=['webrtc_clang'])
31 def webrtc_asan(c): 31 def webrtc_asan(c):
32 # We can't use the 'asan' configuration from the chromium recipe module since 32 # We can't use the 'asan' configuration from the chromium recipe module since
33 # it's also enabling LSan, which we don't yet support: crbug.com/375154. 33 # it's also enabling LSan, which we don't yet support: crbug.com/375154.
34 if 'clang' not in c.compile_py.compiler: # pragma: no cover 34 if 'clang' not in c.compile_py.compiler: # pragma: no cover
(...skipping 26 matching lines...) Expand all
61 c.HOST_PLATFORM) 61 c.HOST_PLATFORM)
62 if c.TARGET_PLATFORM != 'ios': 62 if c.TARGET_PLATFORM != 'ios':
63 raise BadConf('Only "ios" target platform is supported (got: "%s")' % 63 raise BadConf('Only "ios" target platform is supported (got: "%s")' %
64 c.TARGET_PLATFORM) 64 c.TARGET_PLATFORM)
65 c.build_config_fs = c.BUILD_CONFIG + '-iphoneos' 65 c.build_config_fs = c.BUILD_CONFIG + '-iphoneos'
66 66
67 gyp_defs = c.gyp_env.GYP_DEFINES 67 gyp_defs = c.gyp_env.GYP_DEFINES
68 gyp_defs['build_with_libjingle'] = 1 68 gyp_defs['build_with_libjingle'] = 1
69 gyp_defs['chromium_ios_signing'] = 0 69 gyp_defs['chromium_ios_signing'] = 0
70 gyp_defs['key_id'] = '' 70 gyp_defs['key_id'] = ''
71 gyp_defs['mac_sdk'] = '10.9'
71 gyp_defs['target_arch'] = 'armv7' 72 gyp_defs['target_arch'] = 'armv7'
72 gyp_defs['OS'] = c.TARGET_PLATFORM 73 gyp_defs['OS'] = c.TARGET_PLATFORM
73 74
74 c.compile_py.default_targets = ['All'] 75 c.compile_py.default_targets = ['All']
75 76
76 @CONFIG_CTX(includes=['gn']) 77 @CONFIG_CTX(includes=['gn'])
77 def webrtc_gn(c): 78 def webrtc_gn(c):
78 c.project_generator.args = ['build_with_chromium=false'] 79 c.project_generator.args = ['build_with_chromium=false']
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698