scripts/slave/recipe_modules/webrtc/chromium_config.py - Issue 1400283004: WebRTC: Remove build_with_chromium=false flag for GN

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1400283004: WebRTC: Remove build_with_chromium=false flag for GN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Created 5 years, 2 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

OLD	NEW
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 30 matching lines...) Expand all Loading...
41	41

42 gyp_defs = c.gyp_env.GYP_DEFINES	42 gyp_defs = c.gyp_env.GYP_DEFINES

43 gyp_defs['build_with_libjingle'] = 1	43 gyp_defs['build_with_libjingle'] = 1

44 gyp_defs['chromium_ios_signing'] = 0	44 gyp_defs['chromium_ios_signing'] = 0

45 gyp_defs['key_id'] = ''	45 gyp_defs['key_id'] = ''

46 gyp_defs['OS'] = c.TARGET_PLATFORM	46 gyp_defs['OS'] = c.TARGET_PLATFORM

47 _compiler_defaults(c)	47 _compiler_defaults(c)

48	48

49 @CONFIG_CTX(includes=['gn'])	49 @CONFIG_CTX(includes=['gn'])

50 def webrtc_gn(c):	50 def webrtc_gn(c):

51 c.compile_py.default_targets = ['all']	51 c.compile_py.default_targets = ['all']
	kjellander_chromium 2015/10/14 10:58:46 The config is still needed because without it, GN The config is still needed because without it, GN on Windows will get the 'All' target, which fails to build (only 'all' exists for GN). I considered cleaning up our webrtc_standalone config, but I don't think it's useful since we'll be specifying individual targets when we start using analyze anyway, so I'm punting that work.
52 c.project_generator.args = ['build_with_chromium=false']

53	52

54 def _compiler_defaults(c):	53 def _compiler_defaults(c):

55 c.compile_py.default_targets = ['All']	54 c.compile_py.default_targets = ['All']

56 if c.TARGET_PLATFORM in ('mac', 'ios'):	55 if c.TARGET_PLATFORM in ('mac', 'ios'):

57 c.gyp_env.GYP_DEFINES['mac_sdk'] = '10.9'	56 c.gyp_env.GYP_DEFINES['mac_sdk'] = '10.9'

OLD	NEW

« no previous file with comments | « no previous file | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gn.json » ('j') | no next file with comments »