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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-chromeos.arm.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, 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/Release-linux.intel.64-to-chromeos.arm.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-chromeos.intel.32.json » ('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": "Android cannot target 64 bits",
3 "build_config_fs": "Release",
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 }
17 },
18 "blink": { 3 "blink": {
19 "build_config_fs": "Release", 4 "build_config_fs": "Release",
20 "build_dir": "Path('[CHECKOUT]', 'out')", 5 "build_dir": "Path('[CHECKOUT]', 'out')",
21 "compile_py": { 6 "compile_py": {
22 "build_tool": "ninja", 7 "build_tool": "ninja",
23 "compiler": "goma", 8 "compiler": "goma",
24 "default_targets": [ 9 "default_targets": [
25 "blink_tests" 10 "blink_tests"
26 ] 11 ]
27 }, 12 },
28 "gyp_env": { 13 "gyp_env": {
29 "GYP_DEFINES": "component=static_library", 14 "GYP_DEFINES": "component=static_library target_arch=arm",
30 "GYP_GENERATORS": "ninja" 15 "GYP_GENERATORS": "ninja"
31 } 16 }
32 }, 17 },
33 "blink_clang": { 18 "blink_clang": {
34 "build_config_fs": "Release", 19 "build_config_fs": "Release",
35 "build_dir": "Path('[CHECKOUT]', 'out')", 20 "build_dir": "Path('[CHECKOUT]', 'out')",
36 "compile_py": { 21 "compile_py": {
37 "build_tool": "ninja", 22 "build_tool": "ninja",
38 "compiler": "goma-clang", 23 "compiler": "goma-clang",
39 "default_targets": [ 24 "default_targets": [
40 "blink_tests" 25 "blink_tests"
41 ] 26 ]
42 }, 27 },
43 "gyp_env": { 28 "gyp_env": {
44 "GYP_DEFINES": "clang=1 component=static_library", 29 "GYP_DEFINES": "clang=1 component=static_library target_arch=arm",
45 "GYP_GENERATORS": "ninja" 30 "GYP_GENERATORS": "ninja"
46 } 31 }
47 }, 32 },
48 "chromium": { 33 "chromium": {
49 "build_config_fs": "Release", 34 "build_config_fs": "Release",
50 "build_dir": "Path('[CHECKOUT]', 'out')", 35 "build_dir": "Path('[CHECKOUT]', 'out')",
51 "compile_py": { 36 "compile_py": {
52 "build_tool": "ninja", 37 "build_tool": "ninja",
53 "compiler": "goma", 38 "compiler": "goma",
54 "default_targets": [ 39 "default_targets": [
55 "All", 40 "All",
56 "chromium_builder_tests" 41 "chromium_builder_tests"
57 ] 42 ]
58 }, 43 },
59 "gyp_env": { 44 "gyp_env": {
60 "GYP_DEFINES": "component=static_library", 45 "GYP_DEFINES": "component=static_library target_arch=arm",
61 "GYP_GENERATORS": "ninja" 46 "GYP_GENERATORS": "ninja"
62 } 47 }
63 }, 48 },
64 "chromium_clang": { 49 "chromium_clang": {
65 "build_config_fs": "Release", 50 "build_config_fs": "Release",
66 "build_dir": "Path('[CHECKOUT]', 'out')", 51 "build_dir": "Path('[CHECKOUT]', 'out')",
67 "compile_py": { 52 "compile_py": {
68 "build_tool": "ninja", 53 "build_tool": "ninja",
69 "compiler": "goma-clang", 54 "compiler": "goma-clang",
70 "default_targets": [ 55 "default_targets": [
71 "All", 56 "All",
72 "chromium_builder_tests" 57 "chromium_builder_tests"
73 ] 58 ]
74 }, 59 },
75 "gyp_env": { 60 "gyp_env": {
76 "GYP_DEFINES": "clang=1 component=static_library", 61 "GYP_DEFINES": "clang=1 component=static_library target_arch=arm",
77 "GYP_GENERATORS": "ninja" 62 "GYP_GENERATORS": "ninja"
78 } 63 }
79 }, 64 },
80 "clang_builder": { 65 "clang_builder": "config \"clang_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]",
81 "build_config_fs": "Release", 66 "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \" tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]] ",
82 "build_dir": "Path('[CHECKOUT]', 'out')", 67 "component_builder": "config \"component_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
83 "compile_py": { 68 "dartium_builder": "config \"dartium_builder\" includes \"x86_builder\", but [ config \"x86_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
84 "build_tool": "ninja", 69 "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [con fig \"tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
85 "compiler": "goma-clang", 70 "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bi ts]]",
86 "default_targets": [ 71 "main_builder": "config \"main_builder\" includes \"android_defaults\", but [A ndroid cannot target 64 bits]",
87 "All" 72 "main_tests": "config \"main_tests\" includes \"tests_base\", but [config \"te sts_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
88 ]
89 },
90 "gyp_env": {
91 "GYP_CROSSCOMPILE": "1",
92 "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 gc c_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', ' orderfile.out') target_arch=arm",
93 "GYP_GENERATORS": "ninja",
94 "GYP_GENERATOR_FLAGS": "default_target=All"
95 }
96 },
97 "clang_tests": {
98 "build_config_fs": "Release",
99 "build_dir": "Path('[CHECKOUT]', 'out')",
100 "compile_py": {
101 "build_tool": "ninja",
102 "default_targets": [
103 "All"
104 ]
105 },
106 "gyp_env": {
107 "GYP_CROSSCOMPILE": "1",
108 "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",
109 "GYP_GENERATORS": "ninja",
110 "GYP_GENERATOR_FLAGS": "default_target=All"
111 }
112 },
113 "component_builder": {
114 "build_config_fs": "Release",
115 "build_dir": "Path('[CHECKOUT]', 'out')",
116 "compile_py": {
117 "build_tool": "ninja",
118 "compiler": "goma",
119 "default_targets": [
120 "All"
121 ]
122 },
123 "gyp_env": {
124 "GYP_CROSSCOMPILE": "1",
125 "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",
126 "GYP_GENERATORS": "ninja",
127 "GYP_GENERATOR_FLAGS": "default_target=All"
128 }
129 },
130 "dartium_builder": {
131 "build_config_fs": "Release",
132 "build_dir": "Path('[CHECKOUT]', 'out')",
133 "compile_py": {
134 "build_tool": "ninja",
135 "compiler": "goma",
136 "default_targets": [
137 "chrome_apk",
138 "content_shell_apk"
139 ]
140 },
141 "gyp_env": {
142 "GYP_CROSSCOMPILE": "1",
143 "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=ia32",
144 "GYP_GENERATORS": "ninja",
145 "GYP_GENERATOR_FLAGS": "default_target=All"
146 }
147 },
148 "enormous_tests": {
149 "build_config_fs": "Release",
150 "build_dir": "Path('[CHECKOUT]', 'out')",
151 "compile_py": {
152 "build_tool": "ninja",
153 "default_targets": [
154 "All"
155 ]
156 },
157 "gyp_env": {
158 "GYP_CROSSCOMPILE": "1",
159 "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",
160 "GYP_GENERATORS": "ninja",
161 "GYP_GENERATOR_FLAGS": "default_target=All"
162 }
163 },
164 "klp_builder": {
165 "build_config_fs": "Release",
166 "build_dir": "Path('[CHECKOUT]', 'out')",
167 "compile_py": {
168 "build_tool": "ninja",
169 "compiler": "goma",
170 "default_targets": [
171 "All"
172 ]
173 },
174 "gyp_env": {
175 "GYP_CROSSCOMPILE": "1",
176 "GYP_DEFINES": "OS=android android_sdk_root=Path('[CHECKOUT]', 'third_part y', 'android_tools_internal', 'sdk') android_sdk_version=4.4 component=static_li brary fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOU T]', 'orderfiles', 'orderfile.out') target_arch=arm",
177 "GYP_GENERATORS": "ninja",
178 "GYP_GENERATOR_FLAGS": "default_target=All"
179 }
180 },
181 "main_builder": {
182 "build_config_fs": "Release",
183 "build_dir": "Path('[CHECKOUT]', 'out')",
184 "compile_py": {
185 "build_tool": "ninja",
186 "compiler": "goma",
187 "default_targets": [
188 "All"
189 ]
190 },
191 "gyp_env": {
192 "GYP_CROSSCOMPILE": "1",
193 "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",
194 "GYP_GENERATORS": "ninja",
195 "GYP_GENERATOR_FLAGS": "default_target=All"
196 }
197 },
198 "main_tests": {
199 "build_config_fs": "Release",
200 "build_dir": "Path('[CHECKOUT]', 'out')",
201 "compile_py": {
202 "build_tool": "ninja",
203 "default_targets": [
204 "All"
205 ]
206 },
207 "gyp_env": {
208 "GYP_CROSSCOMPILE": "1",
209 "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",
210 "GYP_GENERATORS": "ninja",
211 "GYP_GENERATOR_FLAGS": "default_target=All"
212 }
213 },
214 "msvs": "can not use msvs on \"linux\"", 73 "msvs": "can not use msvs on \"linux\"",
215 "ninja": { 74 "ninja": {
216 "build_config_fs": "Release", 75 "build_config_fs": "Release",
217 "build_dir": "Path('[CHECKOUT]', 'out')", 76 "build_dir": "Path('[CHECKOUT]', 'out')",
218 "compile_py": { 77 "compile_py": {
219 "build_tool": "ninja" 78 "build_tool": "ninja"
220 }, 79 },
221 "gyp_env": { 80 "gyp_env": {
222 "GYP_DEFINES": "component=static_library", 81 "GYP_DEFINES": "component=static_library target_arch=arm",
223 "GYP_GENERATORS": "ninja" 82 "GYP_GENERATORS": "ninja"
224 } 83 }
225 }, 84 },
226 "tests_base": { 85 "tests_base": "config \"tests_base\" includes \"android_defaults\", but [Andro id cannot target 64 bits]",
227 "build_config_fs": "Release", 86 "try_builder": "config \"try_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bi ts]]",
228 "build_dir": "Path('[CHECKOUT]', 'out')", 87 "try_instrumentation_tests": "config \"try_instrumentation_tests\" includes \" tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [And roid cannot target 64 bits]]",
229 "compile_py": {
230 "build_tool": "ninja",
231 "default_targets": [
232 "All"
233 ]
234 },
235 "gyp_env": {
236 "GYP_CROSSCOMPILE": "1",
237 "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",
238 "GYP_GENERATORS": "ninja",
239 "GYP_GENERATOR_FLAGS": "default_target=All"
240 }
241 },
242 "try_builder": {
243 "build_config_fs": "Release",
244 "build_dir": "Path('[CHECKOUT]', 'out')",
245 "compile_py": {
246 "build_tool": "ninja",
247 "compiler": "goma",
248 "default_targets": [
249 "All"
250 ]
251 },
252 "gyp_env": {
253 "GYP_CROSSCOMPILE": "1",
254 "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",
255 "GYP_GENERATORS": "ninja",
256 "GYP_GENERATOR_FLAGS": "default_target=All"
257 }
258 },
259 "try_instrumentation_tests": {
260 "build_config_fs": "Release",
261 "build_dir": "Path('[CHECKOUT]', 'out')",
262 "compile_py": {
263 "build_tool": "ninja",
264 "default_targets": [
265 "All"
266 ]
267 },
268 "gyp_env": {
269 "GYP_CROSSCOMPILE": "1",
270 "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",
271 "GYP_GENERATORS": "ninja",
272 "GYP_GENERATOR_FLAGS": "default_target=All"
273 }
274 },
275 "v8": { 88 "v8": {
276 "build_config_fs": "Release", 89 "build_config_fs": "Release",
277 "build_dir": "Path('[CHECKOUT]')", 90 "build_dir": "Path('[CHECKOUT]')",
278 "compile_py": { 91 "compile_py": {
279 "build_tool": "make", 92 "build_tool": "make",
280 "default_targets": [ 93 "default_targets": [
281 "buildbot" 94 "buildbot"
282 ] 95 ]
283 }, 96 },
284 "gyp_env": { 97 "gyp_env": {
285 "GYP_DEFINES": "v8_target_arch=arm" 98 "GYP_DEFINES": "target_arch=arm v8_target_arch=arm"
286 } 99 }
287 }, 100 },
288 "x86_builder": { 101 "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [And roid cannot target 64 bits]",
289 "build_config_fs": "Release", 102 "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [ config \"x86_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
290 "build_dir": "Path('[CHECKOUT]', 'out')", 103 "x86_try_instrumentation_tests": "config \"x86_try_instrumentation_tests\" inc ludes \"x86_builder\", but [config \"x86_builder\" includes \"android_defaults\" , but [Android cannot target 64 bits]]",
291 "compile_py": {
292 "build_tool": "ninja",
293 "compiler": "goma",
294 "default_targets": [
295 "All"
296 ]
297 },
298 "gyp_env": {
299 "GYP_CROSSCOMPILE": "1",
300 "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=ia32",
301 "GYP_GENERATORS": "ninja",
302 "GYP_GENERATOR_FLAGS": "default_target=All"
303 }
304 },
305 "x86_try_builder": {
306 "build_config_fs": "Release",
307 "build_dir": "Path('[CHECKOUT]', 'out')",
308 "compile_py": {
309 "build_tool": "ninja",
310 "compiler": "goma",
311 "default_targets": [
312 "All"
313 ]
314 },
315 "gyp_env": {
316 "GYP_CROSSCOMPILE": "1",
317 "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=ia32",
318 "GYP_GENERATORS": "ninja",
319 "GYP_GENERATOR_FLAGS": "default_target=All"
320 }
321 },
322 "x86_try_instrumentation_tests": {
323 "build_config_fs": "Release",
324 "build_dir": "Path('[CHECKOUT]', 'out')",
325 "compile_py": {
326 "build_tool": "ninja",
327 "default_targets": [
328 "All"
329 ]
330 },
331 "gyp_env": {
332 "GYP_CROSSCOMPILE": "1",
333 "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",
334 "GYP_GENERATORS": "ninja",
335 "GYP_GENERATOR_FLAGS": "default_target=All"
336 }
337 },
338 "xcodebuild": "can not use xcodebuild on \"linux\"" 104 "xcodebuild": "can not use xcodebuild on \"linux\""
339 } 105 }
OLDNEW
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-chromeos.arm.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-chromeos.intel.32.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698