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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.32-to-ios.arm.32.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-linux.intel.64-to-linux.mips.64.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.32-to-mac.intel.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",
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": "Debug", 4 "build_config_fs": "Debug",
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 "all_webkit" 10 "all_webkit"
26 ] 11 ]
27 }, 12 },
28 "gyp_env": { 13 "gyp_env": {
29 "GYP_DEFINES": "component=shared_library", 14 "GYP_DEFINES": "component=shared_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": "Debug", 19 "build_config_fs": "Debug",
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 "all_webkit" 25 "all_webkit"
41 ] 26 ]
42 }, 27 },
43 "gyp_env": { 28 "gyp_env": {
44 "GYP_DEFINES": "clang=1 component=shared_library", 29 "GYP_DEFINES": "clang=1 component=shared_library target_arch=arm",
45 "GYP_GENERATORS": "ninja" 30 "GYP_GENERATORS": "ninja"
46 } 31 }
47 }, 32 },
48 "chromium": { 33 "chromium": {
49 "build_config_fs": "Debug", 34 "build_config_fs": "Debug",
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=shared_library", 45 "GYP_DEFINES": "component=shared_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": "Debug", 50 "build_config_fs": "Debug",
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=shared_library", 61 "GYP_DEFINES": "clang=1 component=shared_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 [Can only build android on linux.]",
81 "build_config_fs": "Debug", 66 "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \" tests_base\" includes \"android_defaults\", but [Can only build android on linux .]]",
82 "build_dir": "Path('[CHECKOUT]', 'out')", 67 "component_builder": "config \"component_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on linux.]]",
83 "compile_py": { 68 "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [con fig \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
84 "build_tool": "ninja", 69 "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on l inux.]]",
85 "compiler": "goma-clang", 70 "main_builder": "config \"main_builder\" includes \"android_defaults\", but [C an only build android on linux.]",
86 "default_targets": [ 71 "main_tests": "config \"main_tests\" includes \"tests_base\", but [config \"te sts_base\" includes \"android_defaults\", but [Can only build android on linux.] ]",
87 "All"
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": "Debug",
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": "Debug",
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 "enormous_tests": {
131 "build_config_fs": "Debug",
132 "build_dir": "Path('[CHECKOUT]', 'out')",
133 "compile_py": {
134 "build_tool": "ninja",
135 "default_targets": [
136 "All"
137 ]
138 },
139 "gyp_env": {
140 "GYP_CROSSCOMPILE": "1",
141 "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",
142 "GYP_GENERATORS": "ninja",
143 "GYP_GENERATOR_FLAGS": "default_target=All"
144 }
145 },
146 "klp_builder": {
147 "build_config_fs": "Debug",
148 "build_dir": "Path('[CHECKOUT]', 'out')",
149 "compile_py": {
150 "build_tool": "ninja",
151 "compiler": "goma",
152 "default_targets": [
153 "All"
154 ]
155 },
156 "gyp_env": {
157 "GYP_CROSSCOMPILE": "1",
158 "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",
159 "GYP_GENERATORS": "ninja",
160 "GYP_GENERATOR_FLAGS": "default_target=All"
161 }
162 },
163 "main_builder": {
164 "build_config_fs": "Debug",
165 "build_dir": "Path('[CHECKOUT]', 'out')",
166 "compile_py": {
167 "build_tool": "ninja",
168 "compiler": "goma",
169 "default_targets": [
170 "All"
171 ]
172 },
173 "gyp_env": {
174 "GYP_CROSSCOMPILE": "1",
175 "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",
176 "GYP_GENERATORS": "ninja",
177 "GYP_GENERATOR_FLAGS": "default_target=All"
178 }
179 },
180 "main_tests": {
181 "build_config_fs": "Debug",
182 "build_dir": "Path('[CHECKOUT]', 'out')",
183 "compile_py": {
184 "build_tool": "ninja",
185 "default_targets": [
186 "All"
187 ]
188 },
189 "gyp_env": {
190 "GYP_CROSSCOMPILE": "1",
191 "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",
192 "GYP_GENERATORS": "ninja",
193 "GYP_GENERATOR_FLAGS": "default_target=All"
194 }
195 },
196 "msvs": "can not use msvs on \"mac\"", 72 "msvs": "can not use msvs on \"mac\"",
197 "ninja": { 73 "ninja": {
198 "build_config_fs": "Debug", 74 "build_config_fs": "Debug",
199 "build_dir": "Path('[CHECKOUT]', 'out')", 75 "build_dir": "Path('[CHECKOUT]', 'out')",
200 "compile_py": { 76 "compile_py": {
201 "build_tool": "ninja" 77 "build_tool": "ninja"
202 }, 78 },
203 "gyp_env": { 79 "gyp_env": {
204 "GYP_DEFINES": "component=shared_library", 80 "GYP_DEFINES": "component=shared_library target_arch=arm",
205 "GYP_GENERATORS": "ninja" 81 "GYP_GENERATORS": "ninja"
206 } 82 }
207 }, 83 },
208 "tests_base": { 84 "tests_base": "config \"tests_base\" includes \"android_defaults\", but [Can o nly build android on linux.]",
209 "build_config_fs": "Debug", 85 "try_builder": "config \"try_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on l inux.]]",
210 "build_dir": "Path('[CHECKOUT]', 'out')", 86 "try_instrumentation_tests": "config \"try_instrumentation_tests\" includes \" tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
211 "compile_py": {
212 "build_tool": "ninja",
213 "default_targets": [
214 "All"
215 ]
216 },
217 "gyp_env": {
218 "GYP_CROSSCOMPILE": "1",
219 "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",
220 "GYP_GENERATORS": "ninja",
221 "GYP_GENERATOR_FLAGS": "default_target=All"
222 }
223 },
224 "try_builder": {
225 "build_config_fs": "Debug",
226 "build_dir": "Path('[CHECKOUT]', 'out')",
227 "compile_py": {
228 "build_tool": "ninja",
229 "compiler": "goma",
230 "default_targets": [
231 "All"
232 ]
233 },
234 "gyp_env": {
235 "GYP_CROSSCOMPILE": "1",
236 "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",
237 "GYP_GENERATORS": "ninja",
238 "GYP_GENERATOR_FLAGS": "default_target=All"
239 }
240 },
241 "try_instrumentation_tests": {
242 "build_config_fs": "Debug",
243 "build_dir": "Path('[CHECKOUT]', 'out')",
244 "compile_py": {
245 "build_tool": "ninja",
246 "default_targets": [
247 "All"
248 ]
249 },
250 "gyp_env": {
251 "GYP_CROSSCOMPILE": "1",
252 "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",
253 "GYP_GENERATORS": "ninja",
254 "GYP_GENERATOR_FLAGS": "default_target=All"
255 }
256 },
257 "v8": { 87 "v8": {
258 "build_config_fs": "Debug", 88 "build_config_fs": "Debug",
259 "build_dir": "Path('[CHECKOUT]')", 89 "build_dir": "Path('[CHECKOUT]')",
260 "compile_py": { 90 "compile_py": {
261 "build_tool": "make", 91 "build_tool": "make",
262 "default_targets": [ 92 "default_targets": [
263 "buildbot" 93 "buildbot"
264 ] 94 ]
265 }, 95 },
266 "gyp_env": { 96 "gyp_env": {
267 "GYP_DEFINES": "v8_target_arch=arm" 97 "GYP_DEFINES": "target_arch=arm v8_target_arch=arm"
268 } 98 }
269 }, 99 },
270 "x86_builder": { 100 "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [Can only build android on linux.]",
271 "build_config_fs": "Debug", 101 "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.]]",
272 "build_dir": "Path('[CHECKOUT]', 'out')", 102 "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.]]"
273 "compile_py": {
274 "build_tool": "ninja",
275 "compiler": "goma",
276 "default_targets": [
277 "All"
278 ]
279 },
280 "gyp_env": {
281 "GYP_CROSSCOMPILE": "1",
282 "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",
283 "GYP_GENERATORS": "ninja",
284 "GYP_GENERATOR_FLAGS": "default_target=All"
285 }
286 },
287 "x86_try_builder": {
288 "build_config_fs": "Debug",
289 "build_dir": "Path('[CHECKOUT]', 'out')",
290 "compile_py": {
291 "build_tool": "ninja",
292 "compiler": "goma",
293 "default_targets": [
294 "All"
295 ]
296 },
297 "gyp_env": {
298 "GYP_CROSSCOMPILE": "1",
299 "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",
300 "GYP_GENERATORS": "ninja",
301 "GYP_GENERATOR_FLAGS": "default_target=All"
302 }
303 },
304 "x86_try_instrumentation_tests": {
305 "build_config_fs": "Debug",
306 "build_dir": "Path('[CHECKOUT]', 'out')",
307 "compile_py": {
308 "build_tool": "ninja",
309 "default_targets": [
310 "All"
311 ]
312 },
313 "gyp_env": {
314 "GYP_CROSSCOMPILE": "1",
315 "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",
316 "GYP_GENERATORS": "ninja",
317 "GYP_GENERATOR_FLAGS": "default_target=All"
318 }
319 }
320 } 103 }
OLDNEW
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-linux.mips.64.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.32-to-mac.intel.32.json » ('j') | scripts/slave/recipe_modules/chromium_android/chromium_config.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698