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

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-linux.intel.32.json

Issue 134193014: Make recipes use the new way of enabling goma. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 6 years, 10 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
OLDNEW
1 { 1 {
2 "android": { 2 "android": {
3 "build_config_fs": "Debug", 3 "build_config_fs": "Debug",
4 "build_dir": "Path('[CHECKOUT]', 'out')", 4 "build_dir": "Path('[CHECKOUT]', 'out')",
5 "compile_py": { 5 "compile_py": {
6 "build_tool": "ninja", 6 "build_tool": "ninja",
7 "clobber": false, 7 "clobber": false,
8 "compiler": "goma" 8 "compiler": "goma",
9 "goma_dir": "Path('[BUILD]', 'goma')"
9 }, 10 },
10 "gyp_env": { 11 "gyp_env": {
11 "GYP_DEFINES": "OS=linux component=static_library fastbuild=1 host_os=linu x target_arch=ia32", 12 "GYP_DEFINES": "OS=linux component=static_library fastbuild=1 gomadir=Path ('[BUILD]', 'goma') host_os=linux target_arch=ia32 use_goma=1",
12 "GYP_GENERATORS": "ninja" 13 "GYP_GENERATORS": "ninja"
13 } 14 }
14 }, 15 },
15 "android_defaults": { 16 "android_defaults": {
16 "build_config_fs": "Debug", 17 "build_config_fs": "Debug",
17 "build_dir": "Path('[CHECKOUT]', 'out')", 18 "build_dir": "Path('[CHECKOUT]', 'out')",
18 "compile_py": { 19 "compile_py": {
19 "build_tool": "ninja", 20 "build_tool": "ninja",
20 "clobber": false 21 "clobber": false
21 }, 22 },
22 "gyp_env": { 23 "gyp_env": {
23 "GYP_CROSSCOMPILE": "1", 24 "GYP_CROSSCOMPILE": "1",
24 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li nux target_arch=ia32", 25 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li nux target_arch=ia32",
25 "GYP_GENERATORS": "ninja" 26 "GYP_GENERATORS": "ninja"
26 } 27 }
27 }, 28 },
28 "blink": { 29 "blink": {
29 "build_config_fs": "Debug", 30 "build_config_fs": "Debug",
30 "build_dir": "Path('[CHECKOUT]', 'out')", 31 "build_dir": "Path('[CHECKOUT]', 'out')",
31 "compile_py": { 32 "compile_py": {
32 "build_tool": "ninja", 33 "build_tool": "ninja",
33 "clobber": false, 34 "clobber": false,
34 "compiler": "goma", 35 "compiler": "goma",
35 "default_targets": [ 36 "default_targets": [
36 "blink_tests" 37 "blink_tests"
37 ] 38 ],
39 "goma_dir": "Path('[BUILD]', 'goma')"
38 }, 40 },
39 "gyp_env": { 41 "gyp_env": {
40 "GYP_DEFINES": "component=shared_library target_arch=ia32", 42 "GYP_DEFINES": "component=shared_library gomadir=Path('[BUILD]', 'goma') t arget_arch=ia32 use_goma=1",
41 "GYP_GENERATORS": "ninja" 43 "GYP_GENERATORS": "ninja"
42 } 44 }
43 }, 45 },
44 "blink_clang": { 46 "blink_clang": {
45 "build_config_fs": "Debug", 47 "build_config_fs": "Debug",
46 "build_dir": "Path('[CHECKOUT]', 'out')", 48 "build_dir": "Path('[CHECKOUT]', 'out')",
47 "compile_py": { 49 "compile_py": {
48 "build_tool": "ninja", 50 "build_tool": "ninja",
49 "clobber": false, 51 "clobber": false,
50 "compiler": "goma-clang", 52 "compiler": "goma-clang",
51 "default_targets": [ 53 "default_targets": [
52 "blink_tests" 54 "blink_tests"
53 ] 55 ],
56 "goma_dir": "Path('[BUILD]', 'goma')"
54 }, 57 },
55 "gyp_env": { 58 "gyp_env": {
56 "GYP_DEFINES": "clang=1 component=shared_library target_arch=ia32", 59 "GYP_DEFINES": "clang=1 component=shared_library gomadir=Path('[BUILD]', ' goma') target_arch=ia32 use_goma=1",
57 "GYP_GENERATORS": "ninja" 60 "GYP_GENERATORS": "ninja"
58 } 61 }
59 }, 62 },
60 "chromium": { 63 "chromium": {
61 "build_config_fs": "Debug", 64 "build_config_fs": "Debug",
62 "build_dir": "Path('[CHECKOUT]', 'out')", 65 "build_dir": "Path('[CHECKOUT]', 'out')",
63 "compile_py": { 66 "compile_py": {
64 "build_tool": "ninja", 67 "build_tool": "ninja",
65 "clobber": false, 68 "clobber": false,
66 "compiler": "goma", 69 "compiler": "goma",
67 "default_targets": [ 70 "default_targets": [
68 "All", 71 "All",
69 "chromium_builder_tests" 72 "chromium_builder_tests"
70 ] 73 ],
74 "goma_dir": "Path('[BUILD]', 'goma')"
71 }, 75 },
72 "gyp_env": { 76 "gyp_env": {
73 "GYP_DEFINES": "component=shared_library target_arch=ia32", 77 "GYP_DEFINES": "component=shared_library gomadir=Path('[BUILD]', 'goma') t arget_arch=ia32 use_goma=1",
74 "GYP_GENERATORS": "ninja" 78 "GYP_GENERATORS": "ninja"
75 } 79 }
76 }, 80 },
77 "chromium_asan": { 81 "chromium_asan": {
78 "build_config_fs": "Debug", 82 "build_config_fs": "Debug",
79 "build_dir": "Path('[CHECKOUT]', 'out')", 83 "build_dir": "Path('[CHECKOUT]', 'out')",
80 "compile_py": { 84 "compile_py": {
81 "build_tool": "ninja", 85 "build_tool": "ninja",
82 "clobber": false, 86 "clobber": false,
83 "compiler": "goma-clang", 87 "compiler": "goma-clang",
84 "default_targets": [ 88 "default_targets": [
85 "All", 89 "All",
86 "chromium_builder_tests" 90 "chromium_builder_tests"
87 ] 91 ],
92 "goma_dir": "Path('[BUILD]', 'goma')"
88 }, 93 },
89 "gyp_env": { 94 "gyp_env": {
90 "GYP_DEFINES": "asan=1 clang=1 component=shared_library linux_use_tcmalloc =0 lsan=1 target_arch=ia32", 95 "GYP_DEFINES": "asan=1 clang=1 component=shared_library gomadir=Path('[BUI LD]', 'goma') linux_use_tcmalloc=0 lsan=1 target_arch=ia32 use_goma=1",
91 "GYP_GENERATORS": "ninja" 96 "GYP_GENERATORS": "ninja"
92 } 97 }
93 }, 98 },
94 "chromium_chromeos": { 99 "chromium_chromeos": {
95 "build_config_fs": "Debug", 100 "build_config_fs": "Debug",
96 "build_dir": "Path('[CHECKOUT]', 'out')", 101 "build_dir": "Path('[CHECKOUT]', 'out')",
97 "compile_py": { 102 "compile_py": {
98 "build_tool": "ninja", 103 "build_tool": "ninja",
99 "clobber": false, 104 "clobber": false,
100 "compiler": "goma", 105 "compiler": "goma",
101 "default_targets": [ 106 "default_targets": [
102 "All", 107 "All",
103 "chromium_builder_tests" 108 "chromium_builder_tests"
104 ] 109 ],
110 "goma_dir": "Path('[BUILD]', 'goma')"
105 }, 111 },
106 "gyp_env": { 112 "gyp_env": {
107 "GYP_DEFINES": "chromeos=1 component=shared_library ffmpeg_branding=Chrome OS proprietary_codecs=1 target_arch=ia32", 113 "GYP_DEFINES": "chromeos=1 component=shared_library ffmpeg_branding=Chrome OS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=ia32 use_gom a=1",
108 "GYP_GENERATORS": "ninja" 114 "GYP_GENERATORS": "ninja"
109 } 115 }
110 }, 116 },
111 "chromium_chromeos_asan": { 117 "chromium_chromeos_asan": {
112 "build_config_fs": "Debug", 118 "build_config_fs": "Debug",
113 "build_dir": "Path('[CHECKOUT]', 'out')", 119 "build_dir": "Path('[CHECKOUT]', 'out')",
114 "compile_py": { 120 "compile_py": {
115 "build_tool": "ninja", 121 "build_tool": "ninja",
116 "clobber": false, 122 "clobber": false,
117 "compiler": "goma-clang", 123 "compiler": "goma-clang",
118 "default_targets": [ 124 "default_targets": [
119 "All", 125 "All",
120 "chromium_builder_tests" 126 "chromium_builder_tests"
121 ] 127 ],
128 "goma_dir": "Path('[BUILD]', 'goma')"
122 }, 129 },
123 "gyp_env": { 130 "gyp_env": {
124 "GYP_DEFINES": "asan=1 chromeos=1 clang=1 component=shared_library ffmpeg_ branding=ChromeOS linux_use_tcmalloc=0 lsan=1 proprietary_codecs=1 target_arch=i a32", 131 "GYP_DEFINES": "asan=1 chromeos=1 clang=1 component=shared_library ffmpeg_ branding=ChromeOS gomadir=Path('[BUILD]', 'goma') linux_use_tcmalloc=0 lsan=1 pr oprietary_codecs=1 target_arch=ia32 use_goma=1",
125 "GYP_GENERATORS": "ninja" 132 "GYP_GENERATORS": "ninja"
126 } 133 }
127 }, 134 },
128 "chromium_chromeos_clang": { 135 "chromium_chromeos_clang": {
129 "build_config_fs": "Debug", 136 "build_config_fs": "Debug",
130 "build_dir": "Path('[CHECKOUT]', 'out')", 137 "build_dir": "Path('[CHECKOUT]', 'out')",
131 "compile_py": { 138 "compile_py": {
132 "build_tool": "ninja", 139 "build_tool": "ninja",
133 "clobber": false, 140 "clobber": false,
134 "compiler": "goma-clang", 141 "compiler": "goma-clang",
135 "default_targets": [ 142 "default_targets": [
136 "All", 143 "All",
137 "chromium_builder_tests" 144 "chromium_builder_tests"
138 ] 145 ],
146 "goma_dir": "Path('[BUILD]', 'goma')"
139 }, 147 },
140 "gyp_env": { 148 "gyp_env": {
141 "GYP_DEFINES": "chromeos=1 clang=1 component=shared_library ffmpeg_brandin g=ChromeOS proprietary_codecs=1 target_arch=ia32", 149 "GYP_DEFINES": "chromeos=1 clang=1 component=shared_library ffmpeg_brandin g=ChromeOS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=ia32 use_goma=1",
142 "GYP_GENERATORS": "ninja" 150 "GYP_GENERATORS": "ninja"
143 } 151 }
144 }, 152 },
145 "chromium_clang": { 153 "chromium_clang": {
146 "build_config_fs": "Debug", 154 "build_config_fs": "Debug",
147 "build_dir": "Path('[CHECKOUT]', 'out')", 155 "build_dir": "Path('[CHECKOUT]', 'out')",
148 "compile_py": { 156 "compile_py": {
149 "build_tool": "ninja", 157 "build_tool": "ninja",
150 "clobber": false, 158 "clobber": false,
151 "compiler": "goma-clang", 159 "compiler": "goma-clang",
152 "default_targets": [ 160 "default_targets": [
153 "All", 161 "All",
154 "chromium_builder_tests" 162 "chromium_builder_tests"
155 ] 163 ],
164 "goma_dir": "Path('[BUILD]', 'goma')"
156 }, 165 },
157 "gyp_env": { 166 "gyp_env": {
158 "GYP_DEFINES": "clang=1 component=shared_library target_arch=ia32", 167 "GYP_DEFINES": "clang=1 component=shared_library gomadir=Path('[BUILD]', ' goma') target_arch=ia32 use_goma=1",
159 "GYP_GENERATORS": "ninja" 168 "GYP_GENERATORS": "ninja"
160 } 169 }
161 }, 170 },
162 "chromium_official": { 171 "chromium_official": {
163 "build_config_fs": "Debug", 172 "build_config_fs": "Debug",
164 "build_dir": "Path('[CHECKOUT]', 'out')", 173 "build_dir": "Path('[CHECKOUT]', 'out')",
165 "compile_py": { 174 "compile_py": {
166 "build_tool": "ninja", 175 "build_tool": "ninja",
167 "clobber": true, 176 "clobber": true,
168 "compiler": "goma", 177 "compiler": "goma",
169 "default_targets": [ 178 "default_targets": [
170 "chrome", 179 "chrome",
171 "chrome_sandbox", 180 "chrome_sandbox",
172 "linux_symbols", 181 "linux_symbols",
173 "symupload" 182 "symupload"
174 ], 183 ],
184 "goma_dir": "Path('[BUILD]', 'goma')",
175 "mode": "official" 185 "mode": "official"
176 }, 186 },
177 "gyp_env": { 187 "gyp_env": {
178 "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_librar y target_arch=ia32", 188 "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_librar y gomadir=Path('[BUILD]', 'goma') target_arch=ia32 use_goma=1",
179 "GYP_GENERATORS": "ninja" 189 "GYP_GENERATORS": "ninja"
180 } 190 }
181 }, 191 },
182 "clang_builder": { 192 "clang_builder": {
183 "build_config_fs": "Debug", 193 "build_config_fs": "Debug",
184 "build_dir": "Path('[CHECKOUT]', 'out')", 194 "build_dir": "Path('[CHECKOUT]', 'out')",
185 "compile_py": { 195 "compile_py": {
186 "build_tool": "ninja", 196 "build_tool": "ninja",
187 "clobber": false, 197 "clobber": false,
188 "compiler": "goma-clang" 198 "compiler": "goma-clang",
199 "goma_dir": "Path('[BUILD]', 'goma')"
189 }, 200 },
190 "gyp_env": { 201 "gyp_env": {
191 "GYP_CROSSCOMPILE": "1", 202 "GYP_CROSSCOMPILE": "1",
192 "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 ho st_os=linux target_arch=ia32", 203 "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 go madir=Path('[BUILD]', 'goma') host_os=linux target_arch=ia32 use_goma=1",
193 "GYP_GENERATORS": "ninja" 204 "GYP_GENERATORS": "ninja"
194 } 205 }
195 }, 206 },
196 "clang_tests": { 207 "clang_tests": {
197 "build_config_fs": "Debug", 208 "build_config_fs": "Debug",
198 "build_dir": "Path('[CHECKOUT]', 'out')", 209 "build_dir": "Path('[CHECKOUT]', 'out')",
199 "compile_py": { 210 "compile_py": {
200 "build_tool": "ninja", 211 "build_tool": "ninja",
201 "clobber": false 212 "clobber": false
202 }, 213 },
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 "GYP_DEFINES": "target_arch=ia32 v8_target_arch=ia32" 299 "GYP_DEFINES": "target_arch=ia32 v8_target_arch=ia32"
289 } 300 }
290 }, 301 },
291 "webrtc_android_apk_try_builder": "Only \"android\" platform is supported (got : \"linux\")", 302 "webrtc_android_apk_try_builder": "Only \"android\" platform is supported (got : \"linux\")",
292 "x86_builder": { 303 "x86_builder": {
293 "build_config_fs": "Debug", 304 "build_config_fs": "Debug",
294 "build_dir": "Path('[CHECKOUT]', 'out')", 305 "build_dir": "Path('[CHECKOUT]', 'out')",
295 "compile_py": { 306 "compile_py": {
296 "build_tool": "ninja", 307 "build_tool": "ninja",
297 "clobber": false, 308 "clobber": false,
298 "compiler": "goma" 309 "compiler": "goma",
310 "goma_dir": "Path('[BUILD]', 'goma')"
299 }, 311 },
300 "gyp_env": { 312 "gyp_env": {
301 "GYP_CROSSCOMPILE": "1", 313 "GYP_CROSSCOMPILE": "1",
302 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li nux target_arch=ia32", 314 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Pa th('[BUILD]', 'goma') host_os=linux target_arch=ia32 use_goma=1",
303 "GYP_GENERATORS": "ninja" 315 "GYP_GENERATORS": "ninja"
304 } 316 }
305 }, 317 },
306 "x86_try_builder": { 318 "x86_try_builder": {
307 "build_config_fs": "Debug", 319 "build_config_fs": "Debug",
308 "build_dir": "Path('[CHECKOUT]', 'out')", 320 "build_dir": "Path('[CHECKOUT]', 'out')",
309 "compile_py": { 321 "compile_py": {
310 "build_tool": "ninja", 322 "build_tool": "ninja",
311 "clobber": false, 323 "clobber": false,
312 "compiler": "goma" 324 "compiler": "goma",
325 "goma_dir": "Path('[BUILD]', 'goma')"
313 }, 326 },
314 "gyp_env": { 327 "gyp_env": {
315 "GYP_CROSSCOMPILE": "1", 328 "GYP_CROSSCOMPILE": "1",
316 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li nux target_arch=ia32", 329 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Pa th('[BUILD]', 'goma') host_os=linux target_arch=ia32 use_goma=1",
317 "GYP_GENERATORS": "ninja" 330 "GYP_GENERATORS": "ninja"
318 } 331 }
319 }, 332 },
320 "x86_try_instrumentation_tests": { 333 "x86_try_instrumentation_tests": {
321 "build_config_fs": "Debug", 334 "build_config_fs": "Debug",
322 "build_dir": "Path('[CHECKOUT]', 'out')", 335 "build_dir": "Path('[CHECKOUT]', 'out')",
323 "compile_py": { 336 "compile_py": {
324 "build_tool": "ninja", 337 "build_tool": "ninja",
325 "clobber": false, 338 "clobber": false,
326 "compiler": "goma" 339 "compiler": "goma",
340 "goma_dir": "Path('[BUILD]', 'goma')"
327 }, 341 },
328 "gyp_env": { 342 "gyp_env": {
329 "GYP_CROSSCOMPILE": "1", 343 "GYP_CROSSCOMPILE": "1",
330 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li nux target_arch=ia32", 344 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Pa th('[BUILD]', 'goma') host_os=linux target_arch=ia32 use_goma=1",
331 "GYP_GENERATORS": "ninja" 345 "GYP_GENERATORS": "ninja"
332 } 346 }
333 }, 347 },
334 "xcodebuild": "can not use xcodebuild on \"linux\"" 348 "xcodebuild": "can not use xcodebuild on \"linux\""
335 } 349 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698