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

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-android.mips.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": "Release", 3 "build_config_fs": "Release",
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_CROSSCOMPILE": "1", 12 "GYP_CROSSCOMPILE": "1",
12 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li nux target_arch=mips", 13 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Pa th('[BUILD]', 'goma') host_os=linux target_arch=mips use_goma=1",
13 "GYP_GENERATORS": "ninja" 14 "GYP_GENERATORS": "ninja"
14 } 15 }
15 }, 16 },
16 "android_defaults": "Android cannot target 64 bits", 17 "android_defaults": "Android cannot target 64 bits",
17 "blink": { 18 "blink": {
18 "build_config_fs": "Release", 19 "build_config_fs": "Release",
19 "build_dir": "Path('[CHECKOUT]', 'out')", 20 "build_dir": "Path('[CHECKOUT]', 'out')",
20 "compile_py": { 21 "compile_py": {
21 "build_tool": "ninja", 22 "build_tool": "ninja",
22 "clobber": false, 23 "clobber": false,
23 "compiler": "goma", 24 "compiler": "goma",
24 "default_targets": [ 25 "default_targets": [
25 "blink_tests" 26 "blink_tests"
26 ] 27 ],
28 "goma_dir": "Path('[BUILD]', 'goma')"
27 }, 29 },
28 "gyp_env": { 30 "gyp_env": {
29 "GYP_CROSSCOMPILE": "1", 31 "GYP_CROSSCOMPILE": "1",
30 "GYP_DEFINES": "component=static_library target_arch=mips", 32 "GYP_DEFINES": "component=static_library gomadir=Path('[BUILD]', 'goma') t arget_arch=mips use_goma=1",
31 "GYP_GENERATORS": "ninja" 33 "GYP_GENERATORS": "ninja"
32 } 34 }
33 }, 35 },
34 "blink_clang": { 36 "blink_clang": {
35 "build_config_fs": "Release", 37 "build_config_fs": "Release",
36 "build_dir": "Path('[CHECKOUT]', 'out')", 38 "build_dir": "Path('[CHECKOUT]', 'out')",
37 "compile_py": { 39 "compile_py": {
38 "build_tool": "ninja", 40 "build_tool": "ninja",
39 "clobber": false, 41 "clobber": false,
40 "compiler": "goma-clang", 42 "compiler": "goma-clang",
41 "default_targets": [ 43 "default_targets": [
42 "blink_tests" 44 "blink_tests"
43 ] 45 ],
46 "goma_dir": "Path('[BUILD]', 'goma')"
44 }, 47 },
45 "gyp_env": { 48 "gyp_env": {
46 "GYP_CROSSCOMPILE": "1", 49 "GYP_CROSSCOMPILE": "1",
47 "GYP_DEFINES": "clang=1 component=static_library target_arch=mips", 50 "GYP_DEFINES": "clang=1 component=static_library gomadir=Path('[BUILD]', ' goma') target_arch=mips use_goma=1",
48 "GYP_GENERATORS": "ninja" 51 "GYP_GENERATORS": "ninja"
49 } 52 }
50 }, 53 },
51 "chromium": { 54 "chromium": {
52 "build_config_fs": "Release", 55 "build_config_fs": "Release",
53 "build_dir": "Path('[CHECKOUT]', 'out')", 56 "build_dir": "Path('[CHECKOUT]', 'out')",
54 "compile_py": { 57 "compile_py": {
55 "build_tool": "ninja", 58 "build_tool": "ninja",
56 "clobber": false, 59 "clobber": false,
57 "compiler": "goma", 60 "compiler": "goma",
58 "default_targets": [ 61 "default_targets": [
59 "All", 62 "All",
60 "chromium_builder_tests" 63 "chromium_builder_tests"
61 ] 64 ],
65 "goma_dir": "Path('[BUILD]', 'goma')"
62 }, 66 },
63 "gyp_env": { 67 "gyp_env": {
64 "GYP_CROSSCOMPILE": "1", 68 "GYP_CROSSCOMPILE": "1",
65 "GYP_DEFINES": "component=static_library target_arch=mips", 69 "GYP_DEFINES": "component=static_library gomadir=Path('[BUILD]', 'goma') t arget_arch=mips use_goma=1",
66 "GYP_GENERATORS": "ninja" 70 "GYP_GENERATORS": "ninja"
67 } 71 }
68 }, 72 },
69 "chromium_asan": { 73 "chromium_asan": {
70 "build_config_fs": "Release", 74 "build_config_fs": "Release",
71 "build_dir": "Path('[CHECKOUT]', 'out')", 75 "build_dir": "Path('[CHECKOUT]', 'out')",
72 "compile_py": { 76 "compile_py": {
73 "build_tool": "ninja", 77 "build_tool": "ninja",
74 "clobber": false, 78 "clobber": false,
75 "compiler": "goma-clang", 79 "compiler": "goma-clang",
76 "default_targets": [ 80 "default_targets": [
77 "All", 81 "All",
78 "chromium_builder_tests" 82 "chromium_builder_tests"
79 ] 83 ],
84 "goma_dir": "Path('[BUILD]', 'goma')"
80 }, 85 },
81 "gyp_env": { 86 "gyp_env": {
82 "GYP_CROSSCOMPILE": "1", 87 "GYP_CROSSCOMPILE": "1",
83 "GYP_DEFINES": "asan=1 clang=1 component=static_library lsan=1 target_arch =mips", 88 "GYP_DEFINES": "asan=1 clang=1 component=static_library gomadir=Path('[BUI LD]', 'goma') lsan=1 target_arch=mips use_goma=1",
84 "GYP_GENERATORS": "ninja" 89 "GYP_GENERATORS": "ninja"
85 } 90 }
86 }, 91 },
87 "chromium_chromeos": { 92 "chromium_chromeos": {
88 "build_config_fs": "Release", 93 "build_config_fs": "Release",
89 "build_dir": "Path('[CHECKOUT]', 'out')", 94 "build_dir": "Path('[CHECKOUT]', 'out')",
90 "compile_py": { 95 "compile_py": {
91 "build_tool": "ninja", 96 "build_tool": "ninja",
92 "clobber": false, 97 "clobber": false,
93 "compiler": "goma", 98 "compiler": "goma",
94 "default_targets": [ 99 "default_targets": [
95 "All", 100 "All",
96 "chromium_builder_tests" 101 "chromium_builder_tests"
97 ] 102 ],
103 "goma_dir": "Path('[BUILD]', 'goma')"
98 }, 104 },
99 "gyp_env": { 105 "gyp_env": {
100 "GYP_CROSSCOMPILE": "1", 106 "GYP_CROSSCOMPILE": "1",
101 "GYP_DEFINES": "chromeos=1 component=static_library ffmpeg_branding=Chrome OS proprietary_codecs=1 target_arch=mips", 107 "GYP_DEFINES": "chromeos=1 component=static_library ffmpeg_branding=Chrome OS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=mips use_gom a=1",
102 "GYP_GENERATORS": "ninja" 108 "GYP_GENERATORS": "ninja"
103 } 109 }
104 }, 110 },
105 "chromium_chromeos_asan": { 111 "chromium_chromeos_asan": {
106 "build_config_fs": "Release", 112 "build_config_fs": "Release",
107 "build_dir": "Path('[CHECKOUT]', 'out')", 113 "build_dir": "Path('[CHECKOUT]', 'out')",
108 "compile_py": { 114 "compile_py": {
109 "build_tool": "ninja", 115 "build_tool": "ninja",
110 "clobber": false, 116 "clobber": false,
111 "compiler": "goma-clang", 117 "compiler": "goma-clang",
112 "default_targets": [ 118 "default_targets": [
113 "All", 119 "All",
114 "chromium_builder_tests" 120 "chromium_builder_tests"
115 ] 121 ],
122 "goma_dir": "Path('[BUILD]', 'goma')"
116 }, 123 },
117 "gyp_env": { 124 "gyp_env": {
118 "GYP_CROSSCOMPILE": "1", 125 "GYP_CROSSCOMPILE": "1",
119 "GYP_DEFINES": "asan=1 chromeos=1 clang=1 component=static_library ffmpeg_ branding=ChromeOS lsan=1 proprietary_codecs=1 target_arch=mips", 126 "GYP_DEFINES": "asan=1 chromeos=1 clang=1 component=static_library ffmpeg_ branding=ChromeOS gomadir=Path('[BUILD]', 'goma') lsan=1 proprietary_codecs=1 ta rget_arch=mips use_goma=1",
120 "GYP_GENERATORS": "ninja" 127 "GYP_GENERATORS": "ninja"
121 } 128 }
122 }, 129 },
123 "chromium_chromeos_clang": { 130 "chromium_chromeos_clang": {
124 "build_config_fs": "Release", 131 "build_config_fs": "Release",
125 "build_dir": "Path('[CHECKOUT]', 'out')", 132 "build_dir": "Path('[CHECKOUT]', 'out')",
126 "compile_py": { 133 "compile_py": {
127 "build_tool": "ninja", 134 "build_tool": "ninja",
128 "clobber": false, 135 "clobber": false,
129 "compiler": "goma-clang", 136 "compiler": "goma-clang",
130 "default_targets": [ 137 "default_targets": [
131 "All", 138 "All",
132 "chromium_builder_tests" 139 "chromium_builder_tests"
133 ] 140 ],
141 "goma_dir": "Path('[BUILD]', 'goma')"
134 }, 142 },
135 "gyp_env": { 143 "gyp_env": {
136 "GYP_CROSSCOMPILE": "1", 144 "GYP_CROSSCOMPILE": "1",
137 "GYP_DEFINES": "chromeos=1 clang=1 component=static_library ffmpeg_brandin g=ChromeOS proprietary_codecs=1 target_arch=mips", 145 "GYP_DEFINES": "chromeos=1 clang=1 component=static_library ffmpeg_brandin g=ChromeOS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=mips use_goma=1",
138 "GYP_GENERATORS": "ninja" 146 "GYP_GENERATORS": "ninja"
139 } 147 }
140 }, 148 },
141 "chromium_clang": { 149 "chromium_clang": {
142 "build_config_fs": "Release", 150 "build_config_fs": "Release",
143 "build_dir": "Path('[CHECKOUT]', 'out')", 151 "build_dir": "Path('[CHECKOUT]', 'out')",
144 "compile_py": { 152 "compile_py": {
145 "build_tool": "ninja", 153 "build_tool": "ninja",
146 "clobber": false, 154 "clobber": false,
147 "compiler": "goma-clang", 155 "compiler": "goma-clang",
148 "default_targets": [ 156 "default_targets": [
149 "All", 157 "All",
150 "chromium_builder_tests" 158 "chromium_builder_tests"
151 ] 159 ],
160 "goma_dir": "Path('[BUILD]', 'goma')"
152 }, 161 },
153 "gyp_env": { 162 "gyp_env": {
154 "GYP_CROSSCOMPILE": "1", 163 "GYP_CROSSCOMPILE": "1",
155 "GYP_DEFINES": "clang=1 component=static_library target_arch=mips", 164 "GYP_DEFINES": "clang=1 component=static_library gomadir=Path('[BUILD]', ' goma') target_arch=mips use_goma=1",
156 "GYP_GENERATORS": "ninja" 165 "GYP_GENERATORS": "ninja"
157 } 166 }
158 }, 167 },
159 "chromium_official": { 168 "chromium_official": {
160 "build_config_fs": "Release", 169 "build_config_fs": "Release",
161 "build_dir": "Path('[CHECKOUT]', 'out')", 170 "build_dir": "Path('[CHECKOUT]', 'out')",
162 "compile_py": { 171 "compile_py": {
163 "build_tool": "ninja", 172 "build_tool": "ninja",
164 "clobber": true, 173 "clobber": true,
165 "compiler": "goma", 174 "compiler": "goma",
166 "default_targets": [ 175 "default_targets": [
167 "All", 176 "All",
168 "chromium_builder_tests" 177 "chromium_builder_tests"
169 ], 178 ],
179 "goma_dir": "Path('[BUILD]', 'goma')",
170 "mode": "official" 180 "mode": "official"
171 }, 181 },
172 "gyp_env": { 182 "gyp_env": {
173 "GYP_CROSSCOMPILE": "1", 183 "GYP_CROSSCOMPILE": "1",
174 "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_librar y target_arch=mips", 184 "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_librar y gomadir=Path('[BUILD]', 'goma') target_arch=mips use_goma=1",
175 "GYP_GENERATORS": "ninja" 185 "GYP_GENERATORS": "ninja"
176 } 186 }
177 }, 187 },
178 "clang_builder": "config \"clang_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]", 188 "clang_builder": "config \"clang_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]",
179 "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \" tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]] ", 189 "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \" tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]] ",
180 "component_builder": "config \"component_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]", 190 "component_builder": "config \"component_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
181 "dartium_builder": "config \"dartium_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot targ et 64 bits]]", 191 "dartium_builder": "config \"dartium_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot targ et 64 bits]]",
182 "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [con fig \"tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]", 192 "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [con fig \"tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
183 "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bi ts]]", 193 "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bi ts]]",
184 "main_builder": "config \"main_builder\" includes \"android_defaults\", but [A ndroid cannot target 64 bits]", 194 "main_builder": "config \"main_builder\" includes \"android_defaults\", but [A ndroid cannot target 64 bits]",
(...skipping 27 matching lines...) Expand all
212 "GYP_CROSSCOMPILE": "1", 222 "GYP_CROSSCOMPILE": "1",
213 "GYP_DEFINES": "target_arch=mips v8_target_arch=mips" 223 "GYP_DEFINES": "target_arch=mips v8_target_arch=mips"
214 } 224 }
215 }, 225 },
216 "webrtc_android_apk_try_builder": "Only \"intel,arm\" architectures are suppor ted (got: \"mips\")", 226 "webrtc_android_apk_try_builder": "Only \"intel,arm\" architectures are suppor ted (got: \"mips\")",
217 "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [And roid cannot target 64 bits]", 227 "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [And roid cannot target 64 bits]",
218 "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [ config \"x86_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]", 228 "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [ config \"x86_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
219 "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]]", 229 "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]]",
220 "xcodebuild": "can not use xcodebuild on \"linux\"" 230 "xcodebuild": "can not use xcodebuild on \"linux\""
221 } 231 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698