| OLD | NEW |
| 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=arm", | 13 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Pa
th('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1", |
| 13 "GYP_GENERATORS": "ninja" | 14 "GYP_GENERATORS": "ninja" |
| 14 } | 15 } |
| 15 }, | 16 }, |
| 16 "android_defaults": { | 17 "android_defaults": { |
| 17 "build_config_fs": "Release", | 18 "build_config_fs": "Release", |
| 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 }, | 23 }, |
| 23 "gyp_env": { | 24 "gyp_env": { |
| 24 "GYP_CROSSCOMPILE": "1", | 25 "GYP_CROSSCOMPILE": "1", |
| 25 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", | 26 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", |
| 26 "GYP_GENERATORS": "ninja" | 27 "GYP_GENERATORS": "ninja" |
| 27 } | 28 } |
| 28 }, | 29 }, |
| 29 "blink": { | 30 "blink": { |
| 30 "build_config_fs": "Release", | 31 "build_config_fs": "Release", |
| 31 "build_dir": "Path('[CHECKOUT]', 'out')", | 32 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 32 "compile_py": { | 33 "compile_py": { |
| 33 "build_tool": "ninja", | 34 "build_tool": "ninja", |
| 34 "clobber": false, | 35 "clobber": false, |
| 35 "compiler": "goma", | 36 "compiler": "goma", |
| 36 "default_targets": [ | 37 "default_targets": [ |
| 37 "blink_tests" | 38 "blink_tests" |
| 38 ] | 39 ], |
| 40 "goma_dir": "Path('[BUILD]', 'goma')" |
| 39 }, | 41 }, |
| 40 "gyp_env": { | 42 "gyp_env": { |
| 41 "GYP_CROSSCOMPILE": "1", | 43 "GYP_CROSSCOMPILE": "1", |
| 42 "GYP_DEFINES": "component=static_library target_arch=arm", | 44 "GYP_DEFINES": "component=static_library gomadir=Path('[BUILD]', 'goma') t
arget_arch=arm use_goma=1", |
| 43 "GYP_GENERATORS": "ninja" | 45 "GYP_GENERATORS": "ninja" |
| 44 } | 46 } |
| 45 }, | 47 }, |
| 46 "blink_clang": { | 48 "blink_clang": { |
| 47 "build_config_fs": "Release", | 49 "build_config_fs": "Release", |
| 48 "build_dir": "Path('[CHECKOUT]', 'out')", | 50 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 49 "compile_py": { | 51 "compile_py": { |
| 50 "build_tool": "ninja", | 52 "build_tool": "ninja", |
| 51 "clobber": false, | 53 "clobber": false, |
| 52 "compiler": "goma-clang", | 54 "compiler": "goma-clang", |
| 53 "default_targets": [ | 55 "default_targets": [ |
| 54 "blink_tests" | 56 "blink_tests" |
| 55 ] | 57 ], |
| 58 "goma_dir": "Path('[BUILD]', 'goma')" |
| 56 }, | 59 }, |
| 57 "gyp_env": { | 60 "gyp_env": { |
| 58 "GYP_CROSSCOMPILE": "1", | 61 "GYP_CROSSCOMPILE": "1", |
| 59 "GYP_DEFINES": "clang=1 component=static_library target_arch=arm", | 62 "GYP_DEFINES": "clang=1 component=static_library gomadir=Path('[BUILD]', '
goma') target_arch=arm use_goma=1", |
| 60 "GYP_GENERATORS": "ninja" | 63 "GYP_GENERATORS": "ninja" |
| 61 } | 64 } |
| 62 }, | 65 }, |
| 63 "chromium": { | 66 "chromium": { |
| 64 "build_config_fs": "Release", | 67 "build_config_fs": "Release", |
| 65 "build_dir": "Path('[CHECKOUT]', 'out')", | 68 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 66 "compile_py": { | 69 "compile_py": { |
| 67 "build_tool": "ninja", | 70 "build_tool": "ninja", |
| 68 "clobber": false, | 71 "clobber": false, |
| 69 "compiler": "goma", | 72 "compiler": "goma", |
| 70 "default_targets": [ | 73 "default_targets": [ |
| 71 "All", | 74 "All", |
| 72 "chromium_builder_tests" | 75 "chromium_builder_tests" |
| 73 ] | 76 ], |
| 77 "goma_dir": "Path('[BUILD]', 'goma')" |
| 74 }, | 78 }, |
| 75 "gyp_env": { | 79 "gyp_env": { |
| 76 "GYP_CROSSCOMPILE": "1", | 80 "GYP_CROSSCOMPILE": "1", |
| 77 "GYP_DEFINES": "component=static_library target_arch=arm", | 81 "GYP_DEFINES": "component=static_library gomadir=Path('[BUILD]', 'goma') t
arget_arch=arm use_goma=1", |
| 78 "GYP_GENERATORS": "ninja" | 82 "GYP_GENERATORS": "ninja" |
| 79 } | 83 } |
| 80 }, | 84 }, |
| 81 "chromium_asan": { | 85 "chromium_asan": { |
| 82 "build_config_fs": "Release", | 86 "build_config_fs": "Release", |
| 83 "build_dir": "Path('[CHECKOUT]', 'out')", | 87 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 84 "compile_py": { | 88 "compile_py": { |
| 85 "build_tool": "ninja", | 89 "build_tool": "ninja", |
| 86 "clobber": false, | 90 "clobber": false, |
| 87 "compiler": "goma-clang", | 91 "compiler": "goma-clang", |
| 88 "default_targets": [ | 92 "default_targets": [ |
| 89 "All", | 93 "All", |
| 90 "chromium_builder_tests" | 94 "chromium_builder_tests" |
| 91 ] | 95 ], |
| 96 "goma_dir": "Path('[BUILD]', 'goma')" |
| 92 }, | 97 }, |
| 93 "gyp_env": { | 98 "gyp_env": { |
| 94 "GYP_CROSSCOMPILE": "1", | 99 "GYP_CROSSCOMPILE": "1", |
| 95 "GYP_DEFINES": "asan=1 clang=1 component=static_library lsan=1 target_arch
=arm", | 100 "GYP_DEFINES": "asan=1 clang=1 component=static_library gomadir=Path('[BUI
LD]', 'goma') lsan=1 target_arch=arm use_goma=1", |
| 96 "GYP_GENERATORS": "ninja" | 101 "GYP_GENERATORS": "ninja" |
| 97 } | 102 } |
| 98 }, | 103 }, |
| 99 "chromium_chromeos": { | 104 "chromium_chromeos": { |
| 100 "build_config_fs": "Release", | 105 "build_config_fs": "Release", |
| 101 "build_dir": "Path('[CHECKOUT]', 'out')", | 106 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 102 "compile_py": { | 107 "compile_py": { |
| 103 "build_tool": "ninja", | 108 "build_tool": "ninja", |
| 104 "clobber": false, | 109 "clobber": false, |
| 105 "compiler": "goma", | 110 "compiler": "goma", |
| 106 "default_targets": [ | 111 "default_targets": [ |
| 107 "All", | 112 "All", |
| 108 "chromium_builder_tests" | 113 "chromium_builder_tests" |
| 109 ] | 114 ], |
| 115 "goma_dir": "Path('[BUILD]', 'goma')" |
| 110 }, | 116 }, |
| 111 "gyp_env": { | 117 "gyp_env": { |
| 112 "GYP_CROSSCOMPILE": "1", | 118 "GYP_CROSSCOMPILE": "1", |
| 113 "GYP_DEFINES": "chromeos=1 component=static_library ffmpeg_branding=Chrome
OS proprietary_codecs=1 target_arch=arm", | 119 "GYP_DEFINES": "chromeos=1 component=static_library ffmpeg_branding=Chrome
OS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=arm use_goma
=1", |
| 114 "GYP_GENERATORS": "ninja" | 120 "GYP_GENERATORS": "ninja" |
| 115 } | 121 } |
| 116 }, | 122 }, |
| 117 "chromium_chromeos_asan": { | 123 "chromium_chromeos_asan": { |
| 118 "build_config_fs": "Release", | 124 "build_config_fs": "Release", |
| 119 "build_dir": "Path('[CHECKOUT]', 'out')", | 125 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 120 "compile_py": { | 126 "compile_py": { |
| 121 "build_tool": "ninja", | 127 "build_tool": "ninja", |
| 122 "clobber": false, | 128 "clobber": false, |
| 123 "compiler": "goma-clang", | 129 "compiler": "goma-clang", |
| 124 "default_targets": [ | 130 "default_targets": [ |
| 125 "All", | 131 "All", |
| 126 "chromium_builder_tests" | 132 "chromium_builder_tests" |
| 127 ] | 133 ], |
| 134 "goma_dir": "Path('[BUILD]', 'goma')" |
| 128 }, | 135 }, |
| 129 "gyp_env": { | 136 "gyp_env": { |
| 130 "GYP_CROSSCOMPILE": "1", | 137 "GYP_CROSSCOMPILE": "1", |
| 131 "GYP_DEFINES": "asan=1 chromeos=1 clang=1 component=static_library ffmpeg_
branding=ChromeOS lsan=1 proprietary_codecs=1 target_arch=arm", | 138 "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=arm use_goma=1", |
| 132 "GYP_GENERATORS": "ninja" | 139 "GYP_GENERATORS": "ninja" |
| 133 } | 140 } |
| 134 }, | 141 }, |
| 135 "chromium_chromeos_clang": { | 142 "chromium_chromeos_clang": { |
| 136 "build_config_fs": "Release", | 143 "build_config_fs": "Release", |
| 137 "build_dir": "Path('[CHECKOUT]', 'out')", | 144 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 138 "compile_py": { | 145 "compile_py": { |
| 139 "build_tool": "ninja", | 146 "build_tool": "ninja", |
| 140 "clobber": false, | 147 "clobber": false, |
| 141 "compiler": "goma-clang", | 148 "compiler": "goma-clang", |
| 142 "default_targets": [ | 149 "default_targets": [ |
| 143 "All", | 150 "All", |
| 144 "chromium_builder_tests" | 151 "chromium_builder_tests" |
| 145 ] | 152 ], |
| 153 "goma_dir": "Path('[BUILD]', 'goma')" |
| 146 }, | 154 }, |
| 147 "gyp_env": { | 155 "gyp_env": { |
| 148 "GYP_CROSSCOMPILE": "1", | 156 "GYP_CROSSCOMPILE": "1", |
| 149 "GYP_DEFINES": "chromeos=1 clang=1 component=static_library ffmpeg_brandin
g=ChromeOS proprietary_codecs=1 target_arch=arm", | 157 "GYP_DEFINES": "chromeos=1 clang=1 component=static_library ffmpeg_brandin
g=ChromeOS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=arm
use_goma=1", |
| 150 "GYP_GENERATORS": "ninja" | 158 "GYP_GENERATORS": "ninja" |
| 151 } | 159 } |
| 152 }, | 160 }, |
| 153 "chromium_clang": { | 161 "chromium_clang": { |
| 154 "build_config_fs": "Release", | 162 "build_config_fs": "Release", |
| 155 "build_dir": "Path('[CHECKOUT]', 'out')", | 163 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 156 "compile_py": { | 164 "compile_py": { |
| 157 "build_tool": "ninja", | 165 "build_tool": "ninja", |
| 158 "clobber": false, | 166 "clobber": false, |
| 159 "compiler": "goma-clang", | 167 "compiler": "goma-clang", |
| 160 "default_targets": [ | 168 "default_targets": [ |
| 161 "All", | 169 "All", |
| 162 "chromium_builder_tests" | 170 "chromium_builder_tests" |
| 163 ] | 171 ], |
| 172 "goma_dir": "Path('[BUILD]', 'goma')" |
| 164 }, | 173 }, |
| 165 "gyp_env": { | 174 "gyp_env": { |
| 166 "GYP_CROSSCOMPILE": "1", | 175 "GYP_CROSSCOMPILE": "1", |
| 167 "GYP_DEFINES": "clang=1 component=static_library target_arch=arm", | 176 "GYP_DEFINES": "clang=1 component=static_library gomadir=Path('[BUILD]', '
goma') target_arch=arm use_goma=1", |
| 168 "GYP_GENERATORS": "ninja" | 177 "GYP_GENERATORS": "ninja" |
| 169 } | 178 } |
| 170 }, | 179 }, |
| 171 "chromium_official": { | 180 "chromium_official": { |
| 172 "build_config_fs": "Release", | 181 "build_config_fs": "Release", |
| 173 "build_dir": "Path('[CHECKOUT]', 'out')", | 182 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 174 "compile_py": { | 183 "compile_py": { |
| 175 "build_tool": "ninja", | 184 "build_tool": "ninja", |
| 176 "clobber": true, | 185 "clobber": true, |
| 177 "compiler": "goma", | 186 "compiler": "goma", |
| 178 "default_targets": [ | 187 "default_targets": [ |
| 179 "All", | 188 "All", |
| 180 "chromium_builder_tests" | 189 "chromium_builder_tests" |
| 181 ], | 190 ], |
| 191 "goma_dir": "Path('[BUILD]', 'goma')", |
| 182 "mode": "official" | 192 "mode": "official" |
| 183 }, | 193 }, |
| 184 "gyp_env": { | 194 "gyp_env": { |
| 185 "GYP_CROSSCOMPILE": "1", | 195 "GYP_CROSSCOMPILE": "1", |
| 186 "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_librar
y target_arch=arm", | 196 "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_librar
y gomadir=Path('[BUILD]', 'goma') target_arch=arm use_goma=1", |
| 187 "GYP_GENERATORS": "ninja" | 197 "GYP_GENERATORS": "ninja" |
| 188 } | 198 } |
| 189 }, | 199 }, |
| 190 "clang_builder": { | 200 "clang_builder": { |
| 191 "build_config_fs": "Release", | 201 "build_config_fs": "Release", |
| 192 "build_dir": "Path('[CHECKOUT]', 'out')", | 202 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 193 "compile_py": { | 203 "compile_py": { |
| 194 "build_tool": "ninja", | 204 "build_tool": "ninja", |
| 195 "clobber": false, | 205 "clobber": false, |
| 196 "compiler": "goma-clang" | 206 "compiler": "goma-clang", |
| 207 "goma_dir": "Path('[BUILD]', 'goma')" |
| 197 }, | 208 }, |
| 198 "gyp_env": { | 209 "gyp_env": { |
| 199 "GYP_CROSSCOMPILE": "1", | 210 "GYP_CROSSCOMPILE": "1", |
| 200 "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 ho
st_os=linux target_arch=arm", | 211 "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 go
madir=Path('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1", |
| 201 "GYP_GENERATORS": "ninja" | 212 "GYP_GENERATORS": "ninja" |
| 202 } | 213 } |
| 203 }, | 214 }, |
| 204 "clang_tests": { | 215 "clang_tests": { |
| 205 "build_config_fs": "Release", | 216 "build_config_fs": "Release", |
| 206 "build_dir": "Path('[CHECKOUT]', 'out')", | 217 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 207 "compile_py": { | 218 "compile_py": { |
| 208 "build_tool": "ninja", | 219 "build_tool": "ninja", |
| 209 "clobber": false | 220 "clobber": false |
| 210 }, | 221 }, |
| 211 "gyp_env": { | 222 "gyp_env": { |
| 212 "GYP_CROSSCOMPILE": "1", | 223 "GYP_CROSSCOMPILE": "1", |
| 213 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", | 224 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", |
| 214 "GYP_GENERATORS": "ninja" | 225 "GYP_GENERATORS": "ninja" |
| 215 } | 226 } |
| 216 }, | 227 }, |
| 217 "component_builder": { | 228 "component_builder": { |
| 218 "build_config_fs": "Release", | 229 "build_config_fs": "Release", |
| 219 "build_dir": "Path('[CHECKOUT]', 'out')", | 230 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 220 "compile_py": { | 231 "compile_py": { |
| 221 "build_tool": "ninja", | 232 "build_tool": "ninja", |
| 222 "clobber": false, | 233 "clobber": false, |
| 223 "compiler": "goma" | 234 "compiler": "goma", |
| 235 "goma_dir": "Path('[BUILD]', 'goma')" |
| 224 }, | 236 }, |
| 225 "gyp_env": { | 237 "gyp_env": { |
| 226 "GYP_CROSSCOMPILE": "1", | 238 "GYP_CROSSCOMPILE": "1", |
| 227 "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 host_os=li
nux target_arch=arm", | 239 "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gomadir=Pa
th('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1", |
| 228 "GYP_GENERATORS": "ninja" | 240 "GYP_GENERATORS": "ninja" |
| 229 } | 241 } |
| 230 }, | 242 }, |
| 231 "dartium_builder": { | 243 "dartium_builder": { |
| 232 "build_config_fs": "Release", | 244 "build_config_fs": "Release", |
| 233 "build_dir": "Path('[CHECKOUT]', 'out')", | 245 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 234 "compile_py": { | 246 "compile_py": { |
| 235 "build_tool": "ninja", | 247 "build_tool": "ninja", |
| 236 "clobber": false, | 248 "clobber": false, |
| 237 "compiler": "goma", | 249 "compiler": "goma", |
| 238 "default_targets": [ | 250 "default_targets": [ |
| 239 "chrome_apk", | 251 "chrome_apk", |
| 240 "content_shell_apk" | 252 "content_shell_apk" |
| 241 ] | 253 ], |
| 254 "goma_dir": "Path('[BUILD]', 'goma')" |
| 242 }, | 255 }, |
| 243 "gyp_env": { | 256 "gyp_env": { |
| 244 "GYP_CROSSCOMPILE": "1", | 257 "GYP_CROSSCOMPILE": "1", |
| 245 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", | 258 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Pa
th('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1", |
| 246 "GYP_GENERATORS": "ninja" | 259 "GYP_GENERATORS": "ninja" |
| 247 } | 260 } |
| 248 }, | 261 }, |
| 249 "enormous_tests": { | 262 "enormous_tests": { |
| 250 "build_config_fs": "Release", | 263 "build_config_fs": "Release", |
| 251 "build_dir": "Path('[CHECKOUT]', 'out')", | 264 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 252 "compile_py": { | 265 "compile_py": { |
| 253 "build_tool": "ninja", | 266 "build_tool": "ninja", |
| 254 "clobber": false | 267 "clobber": false |
| 255 }, | 268 }, |
| 256 "gyp_env": { | 269 "gyp_env": { |
| 257 "GYP_CROSSCOMPILE": "1", | 270 "GYP_CROSSCOMPILE": "1", |
| 258 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", | 271 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", |
| 259 "GYP_GENERATORS": "ninja" | 272 "GYP_GENERATORS": "ninja" |
| 260 } | 273 } |
| 261 }, | 274 }, |
| 262 "klp_builder": { | 275 "klp_builder": { |
| 263 "build_config_fs": "Release", | 276 "build_config_fs": "Release", |
| 264 "build_dir": "Path('[CHECKOUT]', 'out')", | 277 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 265 "compile_py": { | 278 "compile_py": { |
| 266 "build_tool": "ninja", | 279 "build_tool": "ninja", |
| 267 "clobber": false, | 280 "clobber": false, |
| 268 "compiler": "goma" | 281 "compiler": "goma", |
| 282 "goma_dir": "Path('[BUILD]', 'goma')" |
| 269 }, | 283 }, |
| 270 "gyp_env": { | 284 "gyp_env": { |
| 271 "GYP_CROSSCOMPILE": "1", | 285 "GYP_CROSSCOMPILE": "1", |
| 272 "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 host_os=linux target_arch=arm", | 286 "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 gomadir=Path('[BUILD]', 'goma') host_os=linux target_arch=arm
use_goma=1", |
| 273 "GYP_GENERATORS": "ninja" | 287 "GYP_GENERATORS": "ninja" |
| 274 } | 288 } |
| 275 }, | 289 }, |
| 276 "main_builder": { | 290 "main_builder": { |
| 277 "build_config_fs": "Release", | 291 "build_config_fs": "Release", |
| 278 "build_dir": "Path('[CHECKOUT]', 'out')", | 292 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 279 "compile_py": { | 293 "compile_py": { |
| 280 "build_tool": "ninja", | 294 "build_tool": "ninja", |
| 281 "clobber": false, | 295 "clobber": false, |
| 282 "compiler": "goma" | 296 "compiler": "goma", |
| 297 "goma_dir": "Path('[BUILD]', 'goma')" |
| 283 }, | 298 }, |
| 284 "gyp_env": { | 299 "gyp_env": { |
| 285 "GYP_CROSSCOMPILE": "1", | 300 "GYP_CROSSCOMPILE": "1", |
| 286 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", | 301 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Pa
th('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1", |
| 287 "GYP_GENERATORS": "ninja" | 302 "GYP_GENERATORS": "ninja" |
| 288 } | 303 } |
| 289 }, | 304 }, |
| 290 "main_tests": { | 305 "main_tests": { |
| 291 "build_config_fs": "Release", | 306 "build_config_fs": "Release", |
| 292 "build_dir": "Path('[CHECKOUT]', 'out')", | 307 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 293 "compile_py": { | 308 "compile_py": { |
| 294 "build_tool": "ninja", | 309 "build_tool": "ninja", |
| 295 "clobber": false | 310 "clobber": false |
| 296 }, | 311 }, |
| (...skipping 30 matching lines...) Expand all Loading... |
| 327 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", | 342 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", |
| 328 "GYP_GENERATORS": "ninja" | 343 "GYP_GENERATORS": "ninja" |
| 329 } | 344 } |
| 330 }, | 345 }, |
| 331 "try_builder": { | 346 "try_builder": { |
| 332 "build_config_fs": "Release", | 347 "build_config_fs": "Release", |
| 333 "build_dir": "Path('[CHECKOUT]', 'out')", | 348 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 334 "compile_py": { | 349 "compile_py": { |
| 335 "build_tool": "ninja", | 350 "build_tool": "ninja", |
| 336 "clobber": false, | 351 "clobber": false, |
| 337 "compiler": "goma" | 352 "compiler": "goma", |
| 353 "goma_dir": "Path('[BUILD]', 'goma')" |
| 338 }, | 354 }, |
| 339 "gyp_env": { | 355 "gyp_env": { |
| 340 "GYP_CROSSCOMPILE": "1", | 356 "GYP_CROSSCOMPILE": "1", |
| 341 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux target_arch=arm", | 357 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Pa
th('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1", |
| 342 "GYP_GENERATORS": "ninja" | 358 "GYP_GENERATORS": "ninja" |
| 343 } | 359 } |
| 344 }, | 360 }, |
| 345 "try_instrumentation_tests": { | 361 "try_instrumentation_tests": { |
| 346 "build_config_fs": "Release", | 362 "build_config_fs": "Release", |
| 347 "build_dir": "Path('[CHECKOUT]', 'out')", | 363 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 348 "compile_py": { | 364 "compile_py": { |
| 349 "build_tool": "ninja", | 365 "build_tool": "ninja", |
| 350 "clobber": false | 366 "clobber": false |
| 351 }, | 367 }, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 369 }, | 385 }, |
| 370 "webrtc_android_apk_try_builder": { | 386 "webrtc_android_apk_try_builder": { |
| 371 "build_config_fs": "Release", | 387 "build_config_fs": "Release", |
| 372 "build_dir": "Path('[CHECKOUT]', 'out')", | 388 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 373 "compile_py": { | 389 "compile_py": { |
| 374 "build_tool": "ninja", | 390 "build_tool": "ninja", |
| 375 "clobber": false, | 391 "clobber": false, |
| 376 "compiler": "goma", | 392 "compiler": "goma", |
| 377 "default_targets": [ | 393 "default_targets": [ |
| 378 "android_builder_webrtc" | 394 "android_builder_webrtc" |
| 379 ] | 395 ], |
| 396 "goma_dir": "Path('[BUILD]', 'goma')" |
| 380 }, | 397 }, |
| 381 "gyp_env": { | 398 "gyp_env": { |
| 382 "GYP_CROSSCOMPILE": "1", | 399 "GYP_CROSSCOMPILE": "1", |
| 383 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=li
nux include_tests=1 target_arch=arm", | 400 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Pa
th('[BUILD]', 'goma') host_os=linux include_tests=1 target_arch=arm use_goma=1",
|
| 384 "GYP_GENERATORS": "ninja", | 401 "GYP_GENERATORS": "ninja", |
| 385 "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc" | 402 "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc" |
| 386 } | 403 } |
| 387 }, | 404 }, |
| 388 "x86_builder": "Cannot target x86 with TARGET_ARCH == arm", | 405 "x86_builder": "Cannot target x86 with TARGET_ARCH == arm", |
| 389 "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [
Cannot target x86 with TARGET_ARCH == arm]", | 406 "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [
Cannot target x86 with TARGET_ARCH == arm]", |
| 390 "x86_try_instrumentation_tests": "config \"x86_try_instrumentation_tests\" inc
ludes \"x86_builder\", but [Cannot target x86 with TARGET_ARCH == arm]", | 407 "x86_try_instrumentation_tests": "config \"x86_try_instrumentation_tests\" inc
ludes \"x86_builder\", but [Cannot target x86 with TARGET_ARCH == arm]", |
| 391 "xcodebuild": "can not use xcodebuild on \"linux\"" | 408 "xcodebuild": "can not use xcodebuild on \"linux\"" |
| 392 } | 409 } |
| OLD | NEW |