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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json

Issue 59233015: Make gyp target_arch setting native to chromium/config.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: rebase again Created 7 years 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
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.32.json ('k') | scripts/slave/recipe_modules/chromium_android/api.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 "android_defaults": { 2 "android_defaults": "Can only build android on linux.",
3 "build_config_fs": "Release_x64",
4 "build_dir": "Path('[CHECKOUT]', 'out')",
5 "compile_py": {
6 "build_tool": "ninja",
7 "default_targets": [
8 "All"
9 ]
10 },
11 "gyp_env": {
12 "GYP_CROSSCOMPILE": "1",
13 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",
14 "GYP_GENERATORS": "ninja",
15 "GYP_GENERATOR_FLAGS": "default_target=All",
16 "GYP_MSVS_VERSION": "2012"
17 }
18 },
19 "blink": { 3 "blink": {
20 "build_config_fs": "Release_x64", 4 "build_config_fs": "Release_x64",
21 "build_dir": "Path('[CHECKOUT]', 'out')", 5 "build_dir": "Path('[CHECKOUT]', 'out')",
22 "compile_py": { 6 "compile_py": {
23 "build_tool": "ninja", 7 "build_tool": "ninja",
24 "compiler": "goma", 8 "compiler": "goma",
25 "default_targets": [ 9 "default_targets": [
26 "blink_tests" 10 "blink_tests"
27 ] 11 ]
28 }, 12 },
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 "All", 59 "All",
76 "chromium_builder_tests" 60 "chromium_builder_tests"
77 ] 61 ]
78 }, 62 },
79 "gyp_env": { 63 "gyp_env": {
80 "GYP_DEFINES": "chromium_win_pch=0 clang=1 component=static_library fastbu ild=1 target_arch=x64", 64 "GYP_DEFINES": "chromium_win_pch=0 clang=1 component=static_library fastbu ild=1 target_arch=x64",
81 "GYP_GENERATORS": "ninja", 65 "GYP_GENERATORS": "ninja",
82 "GYP_MSVS_VERSION": "2012" 66 "GYP_MSVS_VERSION": "2012"
83 } 67 }
84 }, 68 },
85 "clang_builder": { 69 "clang_builder": "config \"clang_builder\" includes \"android_defaults\", but [Can only build android on linux.]",
86 "build_config_fs": "Release_x64", 70 "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \" tests_base\" includes \"android_defaults\", but [Can only build android on linux .]]",
87 "build_dir": "Path('[CHECKOUT]', 'out')", 71 "component_builder": "config \"component_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on linux.]]",
88 "compile_py": { 72 "dartium_builder": "config \"dartium_builder\" includes \"x86_builder\", but [ config \"x86_builder\" includes \"android_defaults\", but [Can only build androi d on linux.]]",
89 "build_tool": "ninja", 73 "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [con fig \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
90 "compiler": "goma-clang", 74 "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on l inux.]]",
91 "default_targets": [ 75 "main_builder": "config \"main_builder\" includes \"android_defaults\", but [C an only build android on linux.]",
92 "All" 76 "main_tests": "config \"main_tests\" includes \"tests_base\", but [config \"te sts_base\" includes \"android_defaults\", but [Can only build android on linux.] ]",
93 ]
94 },
95 "gyp_env": {
96 "GYP_CROSSCOMPILE": "1",
97 "GYP_DEFINES": "OS=android chromium_win_pch=0 clang=1 component=static_lib rary fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT ]', 'orderfiles', 'orderfile.out') target_arch=arm",
98 "GYP_GENERATORS": "ninja",
99 "GYP_GENERATOR_FLAGS": "default_target=All",
100 "GYP_MSVS_VERSION": "2012"
101 }
102 },
103 "clang_tests": {
104 "build_config_fs": "Release_x64",
105 "build_dir": "Path('[CHECKOUT]', 'out')",
106 "compile_py": {
107 "build_tool": "ninja",
108 "default_targets": [
109 "All"
110 ]
111 },
112 "gyp_env": {
113 "GYP_CROSSCOMPILE": "1",
114 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",
115 "GYP_GENERATORS": "ninja",
116 "GYP_GENERATOR_FLAGS": "default_target=All",
117 "GYP_MSVS_VERSION": "2012"
118 }
119 },
120 "component_builder": {
121 "build_config_fs": "Release_x64",
122 "build_dir": "Path('[CHECKOUT]', 'out')",
123 "compile_py": {
124 "build_tool": "ninja",
125 "compiler": "goma",
126 "default_targets": [
127 "All"
128 ]
129 },
130 "gyp_env": {
131 "GYP_CROSSCOMPILE": "1",
132 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=shared_library fas tbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'ord erfiles', 'orderfile.out') target_arch=arm",
133 "GYP_GENERATORS": "ninja",
134 "GYP_GENERATOR_FLAGS": "default_target=All",
135 "GYP_MSVS_VERSION": "2012"
136 }
137 },
138 "dartium_builder": {
139 "build_config_fs": "Release_x64",
140 "build_dir": "Path('[CHECKOUT]', 'out')",
141 "compile_py": {
142 "build_tool": "ninja",
143 "compiler": "goma",
144 "default_targets": [
145 "chrome_apk",
146 "content_shell_apk"
147 ]
148 },
149 "gyp_env": {
150 "GYP_CROSSCOMPILE": "1",
151 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas tbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'ord erfiles', 'orderfile.out') target_arch=ia32",
152 "GYP_GENERATORS": "ninja",
153 "GYP_GENERATOR_FLAGS": "default_target=All",
154 "GYP_MSVS_VERSION": "2012"
155 }
156 },
157 "enormous_tests": {
158 "build_config_fs": "Release_x64",
159 "build_dir": "Path('[CHECKOUT]', 'out')",
160 "compile_py": {
161 "build_tool": "ninja",
162 "default_targets": [
163 "All"
164 ]
165 },
166 "gyp_env": {
167 "GYP_CROSSCOMPILE": "1",
168 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",
169 "GYP_GENERATORS": "ninja",
170 "GYP_GENERATOR_FLAGS": "default_target=All",
171 "GYP_MSVS_VERSION": "2012"
172 }
173 },
174 "klp_builder": {
175 "build_config_fs": "Release_x64",
176 "build_dir": "Path('[CHECKOUT]', 'out')",
177 "compile_py": {
178 "build_tool": "ninja",
179 "compiler": "goma",
180 "default_targets": [
181 "All"
182 ]
183 },
184 "gyp_env": {
185 "GYP_CROSSCOMPILE": "1",
186 "GYP_DEFINES": "OS=android android_sdk_root=Path('[CHECKOUT]', 'third_part y', 'android_tools_internal', 'sdk') android_sdk_version=4.4 chromium_win_pch=0 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_sec tion=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm",
187 "GYP_GENERATORS": "ninja",
188 "GYP_GENERATOR_FLAGS": "default_target=All",
189 "GYP_MSVS_VERSION": "2012"
190 }
191 },
192 "main_builder": {
193 "build_config_fs": "Release_x64",
194 "build_dir": "Path('[CHECKOUT]', 'out')",
195 "compile_py": {
196 "build_tool": "ninja",
197 "compiler": "goma",
198 "default_targets": [
199 "All"
200 ]
201 },
202 "gyp_env": {
203 "GYP_CROSSCOMPILE": "1",
204 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas tbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'ord erfiles', 'orderfile.out') target_arch=arm",
205 "GYP_GENERATORS": "ninja",
206 "GYP_GENERATOR_FLAGS": "default_target=All",
207 "GYP_MSVS_VERSION": "2012"
208 }
209 },
210 "main_tests": {
211 "build_config_fs": "Release_x64",
212 "build_dir": "Path('[CHECKOUT]', 'out')",
213 "compile_py": {
214 "build_tool": "ninja",
215 "default_targets": [
216 "All"
217 ]
218 },
219 "gyp_env": {
220 "GYP_CROSSCOMPILE": "1",
221 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",
222 "GYP_GENERATORS": "ninja",
223 "GYP_GENERATOR_FLAGS": "default_target=All",
224 "GYP_MSVS_VERSION": "2012"
225 }
226 },
227 "msvs": { 77 "msvs": {
228 "build_config_fs": "Release_x64", 78 "build_config_fs": "Release_x64",
229 "build_dir": "Path('[CHECKOUT]', 'build')", 79 "build_dir": "Path('[CHECKOUT]', 'build')",
230 "compile_py": { 80 "compile_py": {
231 "build_tool": "msvs" 81 "build_tool": "msvs"
232 }, 82 },
233 "gyp_env": { 83 "gyp_env": {
234 "GYP_DEFINES": "component=static_library target_arch=x64", 84 "GYP_DEFINES": "component=static_library target_arch=x64",
235 "GYP_GENERATORS": "msvs", 85 "GYP_GENERATORS": "msvs",
236 "GYP_GENERATOR_FLAGS": "msvs_error_on_missing_sources=1", 86 "GYP_GENERATOR_FLAGS": "msvs_error_on_missing_sources=1",
237 "GYP_MSVS_VERSION": "2012" 87 "GYP_MSVS_VERSION": "2012"
238 } 88 }
239 }, 89 },
240 "ninja": { 90 "ninja": {
241 "build_config_fs": "Release_x64", 91 "build_config_fs": "Release_x64",
242 "build_dir": "Path('[CHECKOUT]', 'out')", 92 "build_dir": "Path('[CHECKOUT]', 'out')",
243 "compile_py": { 93 "compile_py": {
244 "build_tool": "ninja" 94 "build_tool": "ninja"
245 }, 95 },
246 "gyp_env": { 96 "gyp_env": {
247 "GYP_DEFINES": "component=static_library target_arch=x64", 97 "GYP_DEFINES": "component=static_library target_arch=x64",
248 "GYP_GENERATORS": "ninja", 98 "GYP_GENERATORS": "ninja",
249 "GYP_MSVS_VERSION": "2012" 99 "GYP_MSVS_VERSION": "2012"
250 } 100 }
251 }, 101 },
252 "tests_base": { 102 "tests_base": "config \"tests_base\" includes \"android_defaults\", but [Can o nly build android on linux.]",
253 "build_config_fs": "Release_x64", 103 "try_builder": "config \"try_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on l inux.]]",
254 "build_dir": "Path('[CHECKOUT]', 'out')", 104 "try_instrumentation_tests": "config \"try_instrumentation_tests\" includes \" tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
255 "compile_py": {
256 "build_tool": "ninja",
257 "default_targets": [
258 "All"
259 ]
260 },
261 "gyp_env": {
262 "GYP_CROSSCOMPILE": "1",
263 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",
264 "GYP_GENERATORS": "ninja",
265 "GYP_GENERATOR_FLAGS": "default_target=All",
266 "GYP_MSVS_VERSION": "2012"
267 }
268 },
269 "try_builder": {
270 "build_config_fs": "Release_x64",
271 "build_dir": "Path('[CHECKOUT]', 'out')",
272 "compile_py": {
273 "build_tool": "ninja",
274 "compiler": "goma",
275 "default_targets": [
276 "All"
277 ]
278 },
279 "gyp_env": {
280 "GYP_CROSSCOMPILE": "1",
281 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas tbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'ord erfiles', 'orderfile.out') target_arch=arm",
282 "GYP_GENERATORS": "ninja",
283 "GYP_GENERATOR_FLAGS": "default_target=All",
284 "GYP_MSVS_VERSION": "2012"
285 }
286 },
287 "try_instrumentation_tests": {
288 "build_config_fs": "Release_x64",
289 "build_dir": "Path('[CHECKOUT]', 'out')",
290 "compile_py": {
291 "build_tool": "ninja",
292 "default_targets": [
293 "All"
294 ]
295 },
296 "gyp_env": {
297 "GYP_CROSSCOMPILE": "1",
298 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",
299 "GYP_GENERATORS": "ninja",
300 "GYP_GENERATOR_FLAGS": "default_target=All",
301 "GYP_MSVS_VERSION": "2012"
302 }
303 },
304 "v8": { 105 "v8": {
305 "build_config_fs": "Release", 106 "build_config_fs": "Release",
306 "build_dir": "Path('[CHECKOUT]')", 107 "build_dir": "Path('[CHECKOUT]')",
307 "compile_py": { 108 "compile_py": {
308 "build_tool": "make", 109 "build_tool": "make",
309 "default_targets": [ 110 "default_targets": [
310 "buildbot" 111 "buildbot"
311 ] 112 ]
312 }, 113 },
313 "gyp_env": { 114 "gyp_env": {
314 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64", 115 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64",
315 "GYP_MSVS_VERSION": "2012" 116 "GYP_MSVS_VERSION": "2012"
316 } 117 }
317 }, 118 },
318 "x86_builder": { 119 "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [Can only build android on linux.]",
319 "build_config_fs": "Release_x64", 120 "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [ config \"x86_builder\" includes \"android_defaults\", but [Can only build androi d on linux.]]",
320 "build_dir": "Path('[CHECKOUT]', 'out')", 121 "x86_try_instrumentation_tests": "config \"x86_try_instrumentation_tests\" inc ludes \"x86_builder\", but [config \"x86_builder\" includes \"android_defaults\" , but [Can only build android on linux.]]",
321 "compile_py": {
322 "build_tool": "ninja",
323 "compiler": "goma",
324 "default_targets": [
325 "All"
326 ]
327 },
328 "gyp_env": {
329 "GYP_CROSSCOMPILE": "1",
330 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas tbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'ord erfiles', 'orderfile.out') target_arch=ia32",
331 "GYP_GENERATORS": "ninja",
332 "GYP_GENERATOR_FLAGS": "default_target=All",
333 "GYP_MSVS_VERSION": "2012"
334 }
335 },
336 "x86_try_builder": {
337 "build_config_fs": "Release_x64",
338 "build_dir": "Path('[CHECKOUT]', 'out')",
339 "compile_py": {
340 "build_tool": "ninja",
341 "compiler": "goma",
342 "default_targets": [
343 "All"
344 ]
345 },
346 "gyp_env": {
347 "GYP_CROSSCOMPILE": "1",
348 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas tbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'ord erfiles', 'orderfile.out') target_arch=ia32",
349 "GYP_GENERATORS": "ninja",
350 "GYP_GENERATOR_FLAGS": "default_target=All",
351 "GYP_MSVS_VERSION": "2012"
352 }
353 },
354 "x86_try_instrumentation_tests": {
355 "build_config_fs": "Release_x64",
356 "build_dir": "Path('[CHECKOUT]', 'out')",
357 "compile_py": {
358 "build_tool": "ninja",
359 "default_targets": [
360 "All"
361 ]
362 },
363 "gyp_env": {
364 "GYP_CROSSCOMPILE": "1",
365 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",
366 "GYP_GENERATORS": "ninja",
367 "GYP_GENERATOR_FLAGS": "default_target=All",
368 "GYP_MSVS_VERSION": "2012"
369 }
370 },
371 "xcodebuild": "can not use xcodebuild on \"win\"" 122 "xcodebuild": "can not use xcodebuild on \"win\""
372 } 123 }
OLDNEW
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.32.json ('k') | scripts/slave/recipe_modules/chromium_android/api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698