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

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

Issue 1450313002: WebRTC: Remove redundant GYP_DEFINES on iOS bots. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Remove key_id as well Created 5 years, 1 month 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
« no previous file with comments | « no previous file | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_ios64_debug__gn_.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 recipe_engine.config import BadConf 5 from recipe_engine.config import BadConf
6 from recipe_engine.config_types import Path 6 from recipe_engine.config_types import Path
7 7
8 import DEPS 8 import DEPS
9 CONFIG_CTX = DEPS['chromium'].CONFIG_CTX 9 CONFIG_CTX = DEPS['chromium'].CONFIG_CTX
10 10
(...skipping 25 matching lines...) Expand all
36 c.HOST_PLATFORM) # pragma: no cover 36 c.HOST_PLATFORM) # pragma: no cover
37 if c.TARGET_PLATFORM != 'ios': 37 if c.TARGET_PLATFORM != 'ios':
38 raise BadConf('Only "ios" target platform is supported (got: "%s")' % 38 raise BadConf('Only "ios" target platform is supported (got: "%s")' %
39 c.TARGET_PLATFORM) # pragma: no cover 39 c.TARGET_PLATFORM) # pragma: no cover
40 if c.TARGET_ARCH == 'arm': 40 if c.TARGET_ARCH == 'arm':
41 c.build_config_fs = c.BUILD_CONFIG + '-iphoneos' 41 c.build_config_fs = c.BUILD_CONFIG + '-iphoneos'
42 if c.TARGET_ARCH == 'intel': 42 if c.TARGET_ARCH == 'intel':
43 c.build_config_fs = c.BUILD_CONFIG + '-iphonesimulator' 43 c.build_config_fs = c.BUILD_CONFIG + '-iphonesimulator'
44 44
45 gyp_defs = c.gyp_env.GYP_DEFINES 45 gyp_defs = c.gyp_env.GYP_DEFINES
46 gyp_defs['build_with_libjingle'] = 1
47 gyp_defs['chromium_ios_signing'] = 0 46 gyp_defs['chromium_ios_signing'] = 0
48 gyp_defs['key_id'] = ''
49 gyp_defs['OS'] = c.TARGET_PLATFORM 47 gyp_defs['OS'] = c.TARGET_PLATFORM
50 _compiler_defaults(c) 48 _compiler_defaults(c)
51 49
52 @CONFIG_CTX(includes=['gn']) 50 @CONFIG_CTX(includes=['gn'])
53 def webrtc_gn(c): 51 def webrtc_gn(c):
54 c.compile_py.default_targets = ['all'] 52 c.compile_py.default_targets = ['all']
55 53
56 def _compiler_defaults(c): 54 def _compiler_defaults(c):
57 c.compile_py.default_targets = ['All'] 55 c.compile_py.default_targets = ['All']
58 if c.TARGET_PLATFORM in ('mac', 'ios'): 56 if c.TARGET_PLATFORM in ('mac', 'ios'):
59 c.gyp_env.GYP_DEFINES['mac_sdk'] = '10.9' 57 c.gyp_env.GYP_DEFINES['mac_sdk'] = '10.9'
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_ios64_debug__gn_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698