scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.32-to-mac.intel.32.json - 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/config.expected/Debug-mac.intel.32-to-mac.intel.32.json

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/Debug-mac.intel.32-to-ios.arm.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.64-to-ios.arm.32.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 {	1 {

2 "android_defaults": {	2 "android_defaults": {

3 "build_config_fs": "Debug",	3 "build_config_fs": "Debug",

4 "build_dir": "out",	4 "build_dir": "out",

5 "compile_py": {	5 "compile_py": {

6 "build_tool": "ninja",	6 "build_tool": "ninja",

7 "default_targets": [	7 "default_targets": [

8 "All"	8 "All"

9 ]	9 ]

10 },	10 },

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 "build_dir": "out",	85 "build_dir": "out",

86 "compile_py": {	86 "compile_py": {

87 "build_tool": "ninja",	87 "build_tool": "ninja",

88 "compiler": "goma",	88 "compiler": "goma",

89 "default_targets": [	89 "default_targets": [

90 "All"	90 "All"

91 ]	91 ]

92 },	92 },

93 "gyp_env": {	93 "gyp_env": {

94 "GYP_CROSSCOMPILE": "1",	94 "GYP_CROSSCOMPILE": "1",

95 "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arc h=arm",	95 "GYP_DEFINES": "OS=android android_sdk_root=['third_party', 'android_tools _internal', 'sdk'] android_sdk_version=KeyLimePie component=shared_library fastb uild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile .out'] target_arch=arm",

96 "GYP_GENERATORS": "ninja",	96 "GYP_GENERATORS": "ninja",

97 "GYP_GENERATOR_FLAGS": "default_target=All"	97 "GYP_GENERATOR_FLAGS": "default_target=All"

98 }	98 }

99 },	99 },

100 "main_builder": {	100 "main_builder": {

101 "build_config_fs": "Debug",	101 "build_config_fs": "Debug",

102 "build_dir": "out",	102 "build_dir": "out",

103 "compile_py": {	103 "compile_py": {

104 "build_tool": "ninja",	104 "build_tool": "ninja",

105 "compiler": "goma",	105 "compiler": "goma",

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
161 "build_dir": "out",	161 "build_dir": "out",

162 "compile_py": {	162 "compile_py": {

163 "build_tool": "ninja",	163 "build_tool": "ninja",

164 "compiler": "goma",	164 "compiler": "goma",

165 "default_targets": [	165 "default_targets": [

166 "All"	166 "All"

167 ]	167 ]

168 },	168 },

169 "gyp_env": {	169 "gyp_env": {

170 "GYP_CROSSCOMPILE": "1",	170 "GYP_CROSSCOMPILE": "1",

171 "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arc h=arm",	171 "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arc h=x86",

172 "GYP_GENERATORS": "ninja",	172 "GYP_GENERATORS": "ninja",

173 "GYP_GENERATOR_FLAGS": "default_target=All"	173 "GYP_GENERATOR_FLAGS": "default_target=All"

174 }	174 }

175 }	175 }

176 }	176 }

OLD	NEW