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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.expected/Debug-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: Created 7 years, 1 month 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/Debug-win.intel.64-to-win.intel.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.32-to-android.arm.32.json » ('j') | scripts/slave/recipe_modules/chromium_android/chromium_config.py » ('J')
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": "Debug_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": "Debug_x64", 4 "build_config_fs": "Debug_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 "all_webkit" 10 "all_webkit"
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=shared_library fastbu ild=1 target_arch=x64", 64 "GYP_DEFINES": "chromium_win_pch=0 clang=1 component=shared_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": "Debug_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 "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [con fig \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
89 "build_tool": "ninja", 73 "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on l inux.]]",
90 "compiler": "goma-clang", 74 "main_builder": "config \"main_builder\" includes \"android_defaults\", but [C an only build android on linux.]",
91 "default_targets": [ 75 "main_tests": "config \"main_tests\" includes \"tests_base\", but [config \"te sts_base\" includes \"android_defaults\", but [Can only build android on linux.] ]",
92 "All"
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": "Debug_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": "Debug_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 "enormous_tests": {
139 "build_config_fs": "Debug_x64",
140 "build_dir": "Path('[CHECKOUT]', 'out')",
141 "compile_py": {
142 "build_tool": "ninja",
143 "default_targets": [
144 "All"
145 ]
146 },
147 "gyp_env": {
148 "GYP_CROSSCOMPILE": "1",
149 "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",
150 "GYP_GENERATORS": "ninja",
151 "GYP_GENERATOR_FLAGS": "default_target=All",
152 "GYP_MSVS_VERSION": "2012"
153 }
154 },
155 "klp_builder": {
156 "build_config_fs": "Debug_x64",
157 "build_dir": "Path('[CHECKOUT]', 'out')",
158 "compile_py": {
159 "build_tool": "ninja",
160 "compiler": "goma",
161 "default_targets": [
162 "All"
163 ]
164 },
165 "gyp_env": {
166 "GYP_CROSSCOMPILE": "1",
167 "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",
168 "GYP_GENERATORS": "ninja",
169 "GYP_GENERATOR_FLAGS": "default_target=All",
170 "GYP_MSVS_VERSION": "2012"
171 }
172 },
173 "main_builder": {
174 "build_config_fs": "Debug_x64",
175 "build_dir": "Path('[CHECKOUT]', 'out')",
176 "compile_py": {
177 "build_tool": "ninja",
178 "compiler": "goma",
179 "default_targets": [
180 "All"
181 ]
182 },
183 "gyp_env": {
184 "GYP_CROSSCOMPILE": "1",
185 "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",
186 "GYP_GENERATORS": "ninja",
187 "GYP_GENERATOR_FLAGS": "default_target=All",
188 "GYP_MSVS_VERSION": "2012"
189 }
190 },
191 "main_tests": {
192 "build_config_fs": "Debug_x64",
193 "build_dir": "Path('[CHECKOUT]', 'out')",
194 "compile_py": {
195 "build_tool": "ninja",
196 "default_targets": [
197 "All"
198 ]
199 },
200 "gyp_env": {
201 "GYP_CROSSCOMPILE": "1",
202 "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",
203 "GYP_GENERATORS": "ninja",
204 "GYP_GENERATOR_FLAGS": "default_target=All",
205 "GYP_MSVS_VERSION": "2012"
206 }
207 },
208 "msvs": { 76 "msvs": {
209 "build_config_fs": "Debug_x64", 77 "build_config_fs": "Debug_x64",
210 "build_dir": "Path('[CHECKOUT]', 'build')", 78 "build_dir": "Path('[CHECKOUT]', 'build')",
211 "compile_py": { 79 "compile_py": {
212 "build_tool": "msvs" 80 "build_tool": "msvs"
213 }, 81 },
214 "gyp_env": { 82 "gyp_env": {
215 "GYP_DEFINES": "component=shared_library target_arch=x64", 83 "GYP_DEFINES": "component=shared_library target_arch=x64",
216 "GYP_GENERATORS": "msvs", 84 "GYP_GENERATORS": "msvs",
217 "GYP_GENERATOR_FLAGS": "msvs_error_on_missing_sources=1", 85 "GYP_GENERATOR_FLAGS": "msvs_error_on_missing_sources=1",
218 "GYP_MSVS_VERSION": "2012" 86 "GYP_MSVS_VERSION": "2012"
219 } 87 }
220 }, 88 },
221 "ninja": { 89 "ninja": {
222 "build_config_fs": "Debug_x64", 90 "build_config_fs": "Debug_x64",
223 "build_dir": "Path('[CHECKOUT]', 'out')", 91 "build_dir": "Path('[CHECKOUT]', 'out')",
224 "compile_py": { 92 "compile_py": {
225 "build_tool": "ninja" 93 "build_tool": "ninja"
226 }, 94 },
227 "gyp_env": { 95 "gyp_env": {
228 "GYP_DEFINES": "component=shared_library target_arch=x64", 96 "GYP_DEFINES": "component=shared_library target_arch=x64",
229 "GYP_GENERATORS": "ninja", 97 "GYP_GENERATORS": "ninja",
230 "GYP_MSVS_VERSION": "2012" 98 "GYP_MSVS_VERSION": "2012"
231 } 99 }
232 }, 100 },
233 "tests_base": { 101 "tests_base": "config \"tests_base\" includes \"android_defaults\", but [Can o nly build android on linux.]",
234 "build_config_fs": "Debug_x64", 102 "try_builder": "config \"try_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on l inux.]]",
235 "build_dir": "Path('[CHECKOUT]', 'out')", 103 "try_instrumentation_tests": "config \"try_instrumentation_tests\" includes \" tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
236 "compile_py": {
237 "build_tool": "ninja",
238 "default_targets": [
239 "All"
240 ]
241 },
242 "gyp_env": {
243 "GYP_CROSSCOMPILE": "1",
244 "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",
245 "GYP_GENERATORS": "ninja",
246 "GYP_GENERATOR_FLAGS": "default_target=All",
247 "GYP_MSVS_VERSION": "2012"
248 }
249 },
250 "try_builder": {
251 "build_config_fs": "Debug_x64",
252 "build_dir": "Path('[CHECKOUT]', 'out')",
253 "compile_py": {
254 "build_tool": "ninja",
255 "compiler": "goma",
256 "default_targets": [
257 "All"
258 ]
259 },
260 "gyp_env": {
261 "GYP_CROSSCOMPILE": "1",
262 "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",
263 "GYP_GENERATORS": "ninja",
264 "GYP_GENERATOR_FLAGS": "default_target=All",
265 "GYP_MSVS_VERSION": "2012"
266 }
267 },
268 "try_instrumentation_tests": {
269 "build_config_fs": "Debug_x64",
270 "build_dir": "Path('[CHECKOUT]', 'out')",
271 "compile_py": {
272 "build_tool": "ninja",
273 "default_targets": [
274 "All"
275 ]
276 },
277 "gyp_env": {
278 "GYP_CROSSCOMPILE": "1",
279 "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",
280 "GYP_GENERATORS": "ninja",
281 "GYP_GENERATOR_FLAGS": "default_target=All",
282 "GYP_MSVS_VERSION": "2012"
283 }
284 },
285 "v8": { 104 "v8": {
286 "build_config_fs": "Debug", 105 "build_config_fs": "Debug",
287 "build_dir": "Path('[CHECKOUT]')", 106 "build_dir": "Path('[CHECKOUT]')",
288 "compile_py": { 107 "compile_py": {
289 "build_tool": "make", 108 "build_tool": "make",
290 "default_targets": [ 109 "default_targets": [
291 "buildbot" 110 "buildbot"
292 ] 111 ]
293 }, 112 },
294 "gyp_env": { 113 "gyp_env": {
295 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64", 114 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64",
296 "GYP_MSVS_VERSION": "2012" 115 "GYP_MSVS_VERSION": "2012"
297 } 116 }
298 }, 117 },
299 "x86_builder": { 118 "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [Can only build android on linux.]",
300 "build_config_fs": "Debug_x64", 119 "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.]]",
301 "build_dir": "Path('[CHECKOUT]', 'out')", 120 "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.]]",
302 "compile_py": {
303 "build_tool": "ninja",
304 "compiler": "goma",
305 "default_targets": [
306 "All"
307 ]
308 },
309 "gyp_env": {
310 "GYP_CROSSCOMPILE": "1",
311 "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",
312 "GYP_GENERATORS": "ninja",
313 "GYP_GENERATOR_FLAGS": "default_target=All",
314 "GYP_MSVS_VERSION": "2012"
315 }
316 },
317 "x86_try_builder": {
318 "build_config_fs": "Debug_x64",
319 "build_dir": "Path('[CHECKOUT]', 'out')",
320 "compile_py": {
321 "build_tool": "ninja",
322 "compiler": "goma",
323 "default_targets": [
324 "All"
325 ]
326 },
327 "gyp_env": {
328 "GYP_CROSSCOMPILE": "1",
329 "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",
330 "GYP_GENERATORS": "ninja",
331 "GYP_GENERATOR_FLAGS": "default_target=All",
332 "GYP_MSVS_VERSION": "2012"
333 }
334 },
335 "x86_try_instrumentation_tests": {
336 "build_config_fs": "Debug_x64",
337 "build_dir": "Path('[CHECKOUT]', 'out')",
338 "compile_py": {
339 "build_tool": "ninja",
340 "default_targets": [
341 "All"
342 ]
343 },
344 "gyp_env": {
345 "GYP_CROSSCOMPILE": "1",
346 "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",
347 "GYP_GENERATORS": "ninja",
348 "GYP_GENERATOR_FLAGS": "default_target=All",
349 "GYP_MSVS_VERSION": "2012"
350 }
351 },
352 "xcodebuild": "can not use xcodebuild on \"win\"" 121 "xcodebuild": "can not use xcodebuild on \"win\""
353 } 122 }
OLDNEW
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Debug-win.intel.64-to-win.intel.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.32-to-android.arm.32.json » ('j') | scripts/slave/recipe_modules/chromium_android/chromium_config.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698