scripts/slave/recipe_modules/chromium_android/chromium_config.py - Issue 23532085: [chormium_android api] Set KLP and x86 GYP_DEFINES.

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/chromium_android/chromium_config.py

Issue 23532085: [chormium_android api] Set KLP and x86 GYP_DEFINES. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Remove a spurious pass Created 7 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

« no previous file with comments | « scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json ('k') | scripts/slave/recipes/android/android_builder.expected/klp_builder.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_MODULES.chromium import CONFIG_CTX	5 from RECIPE_MODULES.chromium import CONFIG_CTX

6	6

7 @CONFIG_CTX(includes=['ninja'])	7 @CONFIG_CTX(includes=['ninja'])

8 def android_defaults(c):	8 def android_defaults(c):

9 c.compile_py.default_targets=['All']	9 c.compile_py.default_targets=['All']

10 c.gyp_env.GYP_CROSSCOMPILE = 1	10 c.gyp_env.GYP_CROSSCOMPILE = 1

(...skipping 15 matching lines...) Expand all Loading...
26 @CONFIG_CTX(includes=['android_defaults', 'clang', 'goma'])	26 @CONFIG_CTX(includes=['android_defaults', 'clang', 'goma'])

27 def clang_builder(c):	27 def clang_builder(c):

28 pass	28 pass

29	29

30 @CONFIG_CTX(includes=['main_builder'])	30 @CONFIG_CTX(includes=['main_builder'])

31 def component_builder(c):	31 def component_builder(c):

32 c.gyp_env.GYP_DEFINES['component'] = 'shared_library'	32 c.gyp_env.GYP_DEFINES['component'] = 'shared_library'

33	33

34 @CONFIG_CTX(includes=['main_builder'])	34 @CONFIG_CTX(includes=['main_builder'])

35 def x86_builder(c):	35 def x86_builder(c):

36 pass	36 c.gyp_env.GYP_DEFINES['target_arch'] = 'x86'

37	37

38 @CONFIG_CTX(includes=['main_builder'])	38 @CONFIG_CTX(includes=['main_builder'])

39 def klp_builder(c):	39 def klp_builder(c):

40 pass	40 gyp_defs = c.gyp_env.GYP_DEFINES

	41 gyp_defs['android_sdk_version'] = 'KeyLimePie'

	42 gyp_defs['android_sdk_root'] = ['third_party', 'android_tools_internal',

	43 'sdk']

41	44

42 @CONFIG_CTX(includes=['main_builder'])	45 @CONFIG_CTX(includes=['main_builder'])

43 def try_builder(c):	46 def try_builder(c):

44 pass	47 pass

OLD	NEW