scripts/slave/recipe_modules/webrtc/chromium_config.py - Issue 1111413005: Some changes to allow recipes and modules to live noncentrally

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 1111413005: Some changes to allow recipes and modules to live noncentrally (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Review comments Created 5 years, 7 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 slave.recipe_config import BadConf	5 from slave.recipe_config import BadConf

6	6

7 from RECIPE_MODULES.chromium import CONFIG_CTX	7 import DEPS

	8 CONFIG_CTX = DEPS['chromium'].CONFIG_CTX

8 from slave.recipe_config_types import Path	9 from slave.recipe_config_types import Path

9	10

10	11

11 SUPPORTED_TARGET_ARCHS = ('intel', 'arm')	12 SUPPORTED_TARGET_ARCHS = ('intel', 'arm')

12	13

13	14

14 @CONFIG_CTX(includes=['chromium', 'dcheck'])	15 @CONFIG_CTX(includes=['chromium', 'dcheck'])

15 def webrtc_standalone(c):	16 def webrtc_standalone(c):

16 _compiler_defaults(c)	17 _compiler_defaults(c)

17	18

(...skipping 29 matching lines...) Expand all Loading...
47	48

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

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

50 c.compile_py.default_targets = ['all']	51 c.compile_py.default_targets = ['all']

51 c.project_generator.args = ['build_with_chromium=false']	52 c.project_generator.args = ['build_with_chromium=false']

52	53

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

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

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

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

OLD	NEW