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

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.64-to-mac.intel.64.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-clang" 8 "compiler": "goma-clang",
9 "goma_dir": "Path('[BUILD]', 'goma')"
9 }, 10 },
10 "gyp_env": { 11 "gyp_env": {
11 "GYP_DEFINES": "OS=mac clang=1 component=static_library fastbuild=1 host_o s=mac target_arch=x64", 12 "GYP_DEFINES": "OS=mac clang=1 component=static_library fastbuild=1 gomadi r=Path('[BUILD]', 'goma') host_os=mac target_arch=x64 use_goma=1",
12 "GYP_GENERATORS": "ninja" 13 "GYP_GENERATORS": "ninja"
13 } 14 }
14 }, 15 },
15 "android_defaults": "Can only build android on linux.", 16 "android_defaults": "Can only build android on linux.",
16 "blink": { 17 "blink": {
17 "build_config_fs": "Debug", 18 "build_config_fs": "Debug",
18 "build_dir": "Path('[CHECKOUT]', 'out')", 19 "build_dir": "Path('[CHECKOUT]', 'out')",
19 "compile_py": { 20 "compile_py": {
20 "build_tool": "ninja", 21 "build_tool": "ninja",
21 "clobber": false, 22 "clobber": false,
22 "compiler": "goma-clang", 23 "compiler": "goma-clang",
23 "default_targets": [ 24 "default_targets": [
24 "blink_tests" 25 "blink_tests"
25 ] 26 ],
27 "goma_dir": "Path('[BUILD]', 'goma')"
26 }, 28 },
27 "gyp_env": { 29 "gyp_env": {
28 "GYP_DEFINES": "clang=1 component=shared_library target_arch=x64", 30 "GYP_DEFINES": "clang=1 component=shared_library gomadir=Path('[BUILD]', ' goma') target_arch=x64 use_goma=1",
29 "GYP_GENERATORS": "ninja" 31 "GYP_GENERATORS": "ninja"
30 } 32 }
31 }, 33 },
32 "blink_clang": { 34 "blink_clang": {
33 "build_config_fs": "Debug", 35 "build_config_fs": "Debug",
34 "build_dir": "Path('[CHECKOUT]', 'out')", 36 "build_dir": "Path('[CHECKOUT]', 'out')",
35 "compile_py": { 37 "compile_py": {
36 "build_tool": "ninja", 38 "build_tool": "ninja",
37 "clobber": false, 39 "clobber": false,
38 "compiler": "goma-clang", 40 "compiler": "goma-clang",
39 "default_targets": [ 41 "default_targets": [
40 "blink_tests" 42 "blink_tests"
41 ] 43 ],
44 "goma_dir": "Path('[BUILD]', 'goma')"
42 }, 45 },
43 "gyp_env": { 46 "gyp_env": {
44 "GYP_DEFINES": "clang=1 component=shared_library target_arch=x64", 47 "GYP_DEFINES": "clang=1 component=shared_library gomadir=Path('[BUILD]', ' goma') target_arch=x64 use_goma=1",
45 "GYP_GENERATORS": "ninja" 48 "GYP_GENERATORS": "ninja"
46 } 49 }
47 }, 50 },
48 "chromium": { 51 "chromium": {
49 "build_config_fs": "Debug", 52 "build_config_fs": "Debug",
50 "build_dir": "Path('[CHECKOUT]', 'out')", 53 "build_dir": "Path('[CHECKOUT]', 'out')",
51 "compile_py": { 54 "compile_py": {
52 "build_tool": "ninja", 55 "build_tool": "ninja",
53 "clobber": false, 56 "clobber": false,
54 "compiler": "goma-clang", 57 "compiler": "goma-clang",
55 "default_targets": [ 58 "default_targets": [
56 "All", 59 "All",
57 "chromium_builder_tests" 60 "chromium_builder_tests"
58 ] 61 ],
62 "goma_dir": "Path('[BUILD]', 'goma')"
59 }, 63 },
60 "gyp_env": { 64 "gyp_env": {
61 "GYP_DEFINES": "clang=1 component=shared_library target_arch=x64", 65 "GYP_DEFINES": "clang=1 component=shared_library gomadir=Path('[BUILD]', ' goma') target_arch=x64 use_goma=1",
62 "GYP_GENERATORS": "ninja" 66 "GYP_GENERATORS": "ninja"
63 } 67 }
64 }, 68 },
65 "chromium_asan": { 69 "chromium_asan": {
66 "build_config_fs": "Debug", 70 "build_config_fs": "Debug",
67 "build_dir": "Path('[CHECKOUT]', 'out')", 71 "build_dir": "Path('[CHECKOUT]', 'out')",
68 "compile_py": { 72 "compile_py": {
69 "build_tool": "ninja", 73 "build_tool": "ninja",
70 "clobber": false, 74 "clobber": false,
71 "compiler": "goma-clang", 75 "compiler": "goma-clang",
72 "default_targets": [ 76 "default_targets": [
73 "All", 77 "All",
74 "chromium_builder_tests" 78 "chromium_builder_tests"
75 ] 79 ],
80 "goma_dir": "Path('[BUILD]', 'goma')"
76 }, 81 },
77 "gyp_env": { 82 "gyp_env": {
78 "GYP_DEFINES": "asan=1 clang=1 component=shared_library lsan=1 target_arch =x64", 83 "GYP_DEFINES": "asan=1 clang=1 component=shared_library gomadir=Path('[BUI LD]', 'goma') lsan=1 target_arch=x64 use_goma=1",
79 "GYP_GENERATORS": "ninja" 84 "GYP_GENERATORS": "ninja"
80 } 85 }
81 }, 86 },
82 "chromium_chromeos": { 87 "chromium_chromeos": {
83 "build_config_fs": "Debug", 88 "build_config_fs": "Debug",
84 "build_dir": "Path('[CHECKOUT]', 'out')", 89 "build_dir": "Path('[CHECKOUT]', 'out')",
85 "compile_py": { 90 "compile_py": {
86 "build_tool": "ninja", 91 "build_tool": "ninja",
87 "clobber": false, 92 "clobber": false,
88 "compiler": "goma-clang", 93 "compiler": "goma-clang",
89 "default_targets": [ 94 "default_targets": [
90 "All", 95 "All",
91 "chromium_builder_tests" 96 "chromium_builder_tests"
92 ] 97 ],
98 "goma_dir": "Path('[BUILD]', 'goma')"
93 }, 99 },
94 "gyp_env": { 100 "gyp_env": {
95 "GYP_DEFINES": "chromeos=1 clang=1 component=shared_library ffmpeg_brandin g=ChromeOS proprietary_codecs=1 target_arch=x64", 101 "GYP_DEFINES": "chromeos=1 clang=1 component=shared_library ffmpeg_brandin g=ChromeOS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=x64 use_goma=1",
96 "GYP_GENERATORS": "ninja" 102 "GYP_GENERATORS": "ninja"
97 } 103 }
98 }, 104 },
99 "chromium_chromeos_asan": { 105 "chromium_chromeos_asan": {
100 "build_config_fs": "Debug", 106 "build_config_fs": "Debug",
101 "build_dir": "Path('[CHECKOUT]', 'out')", 107 "build_dir": "Path('[CHECKOUT]', 'out')",
102 "compile_py": { 108 "compile_py": {
103 "build_tool": "ninja", 109 "build_tool": "ninja",
104 "clobber": false, 110 "clobber": false,
105 "compiler": "goma-clang", 111 "compiler": "goma-clang",
106 "default_targets": [ 112 "default_targets": [
107 "All", 113 "All",
108 "chromium_builder_tests" 114 "chromium_builder_tests"
109 ] 115 ],
116 "goma_dir": "Path('[BUILD]', 'goma')"
110 }, 117 },
111 "gyp_env": { 118 "gyp_env": {
112 "GYP_DEFINES": "asan=1 chromeos=1 clang=1 component=shared_library ffmpeg_ branding=ChromeOS lsan=1 proprietary_codecs=1 target_arch=x64", 119 "GYP_DEFINES": "asan=1 chromeos=1 clang=1 component=shared_library ffmpeg_ branding=ChromeOS gomadir=Path('[BUILD]', 'goma') lsan=1 proprietary_codecs=1 ta rget_arch=x64 use_goma=1",
113 "GYP_GENERATORS": "ninja" 120 "GYP_GENERATORS": "ninja"
114 } 121 }
115 }, 122 },
116 "chromium_chromeos_clang": { 123 "chromium_chromeos_clang": {
117 "build_config_fs": "Debug", 124 "build_config_fs": "Debug",
118 "build_dir": "Path('[CHECKOUT]', 'out')", 125 "build_dir": "Path('[CHECKOUT]', 'out')",
119 "compile_py": { 126 "compile_py": {
120 "build_tool": "ninja", 127 "build_tool": "ninja",
121 "clobber": false, 128 "clobber": false,
122 "compiler": "goma-clang", 129 "compiler": "goma-clang",
123 "default_targets": [ 130 "default_targets": [
124 "All", 131 "All",
125 "chromium_builder_tests" 132 "chromium_builder_tests"
126 ] 133 ],
134 "goma_dir": "Path('[BUILD]', 'goma')"
127 }, 135 },
128 "gyp_env": { 136 "gyp_env": {
129 "GYP_DEFINES": "chromeos=1 clang=1 component=shared_library ffmpeg_brandin g=ChromeOS proprietary_codecs=1 target_arch=x64", 137 "GYP_DEFINES": "chromeos=1 clang=1 component=shared_library ffmpeg_brandin g=ChromeOS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=x64 use_goma=1",
130 "GYP_GENERATORS": "ninja" 138 "GYP_GENERATORS": "ninja"
131 } 139 }
132 }, 140 },
133 "chromium_clang": { 141 "chromium_clang": {
134 "build_config_fs": "Debug", 142 "build_config_fs": "Debug",
135 "build_dir": "Path('[CHECKOUT]', 'out')", 143 "build_dir": "Path('[CHECKOUT]', 'out')",
136 "compile_py": { 144 "compile_py": {
137 "build_tool": "ninja", 145 "build_tool": "ninja",
138 "clobber": false, 146 "clobber": false,
139 "compiler": "goma-clang", 147 "compiler": "goma-clang",
140 "default_targets": [ 148 "default_targets": [
141 "All", 149 "All",
142 "chromium_builder_tests" 150 "chromium_builder_tests"
143 ] 151 ],
152 "goma_dir": "Path('[BUILD]', 'goma')"
144 }, 153 },
145 "gyp_env": { 154 "gyp_env": {
146 "GYP_DEFINES": "clang=1 component=shared_library target_arch=x64", 155 "GYP_DEFINES": "clang=1 component=shared_library gomadir=Path('[BUILD]', ' goma') target_arch=x64 use_goma=1",
147 "GYP_GENERATORS": "ninja" 156 "GYP_GENERATORS": "ninja"
148 } 157 }
149 }, 158 },
150 "chromium_official": { 159 "chromium_official": {
151 "build_config_fs": "Debug", 160 "build_config_fs": "Debug",
152 "build_dir": "Path('[CHECKOUT]', 'out')", 161 "build_dir": "Path('[CHECKOUT]', 'out')",
153 "compile_py": { 162 "compile_py": {
154 "build_tool": "ninja", 163 "build_tool": "ninja",
155 "clobber": true, 164 "clobber": true,
156 "compiler": "goma-clang", 165 "compiler": "goma-clang",
166 "goma_dir": "Path('[BUILD]', 'goma')",
157 "mode": "official" 167 "mode": "official"
158 }, 168 },
159 "gyp_env": { 169 "gyp_env": {
160 "GYP_DEFINES": "branding=Chrome buildtype=Official clang=1 component=stati c_library target_arch=x64", 170 "GYP_DEFINES": "branding=Chrome buildtype=Official clang=1 component=stati c_library gomadir=Path('[BUILD]', 'goma') target_arch=x64 use_goma=1",
161 "GYP_GENERATORS": "ninja" 171 "GYP_GENERATORS": "ninja"
162 } 172 }
163 }, 173 },
164 "clang_builder": "config \"clang_builder\" includes \"android_defaults\", but [Can only build android on linux.]", 174 "clang_builder": "config \"clang_builder\" includes \"android_defaults\", but [Can only build android on linux.]",
165 "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \" tests_base\" includes \"android_defaults\", but [Can only build android on linux .]]", 175 "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \" tests_base\" includes \"android_defaults\", but [Can only build android on linux .]]",
166 "component_builder": "config \"component_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on linux.]]", 176 "component_builder": "config \"component_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on linux.]]",
167 "dartium_builder": "config \"dartium_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build andr oid on linux.]]", 177 "dartium_builder": "config \"dartium_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build andr oid on linux.]]",
168 "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [con fig \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]", 178 "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [con fig \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
169 "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on l inux.]]", 179 "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on l inux.]]",
170 "main_builder": "config \"main_builder\" includes \"android_defaults\", but [C an only build android on linux.]", 180 "main_builder": "config \"main_builder\" includes \"android_defaults\", but [C an only build android on linux.]",
(...skipping 24 matching lines...) Expand all
195 }, 205 },
196 "gyp_env": { 206 "gyp_env": {
197 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64" 207 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64"
198 } 208 }
199 }, 209 },
200 "webrtc_android_apk_try_builder": "Only \"android\" platform is supported (got : \"mac\")", 210 "webrtc_android_apk_try_builder": "Only \"android\" platform is supported (got : \"mac\")",
201 "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [Can only build android on linux.]", 211 "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [Can only build android on linux.]",
202 "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.]]", 212 "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.]]",
203 "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.]]" 213 "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.]]"
204 } 214 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698