| OLD | NEW |
| 1 { | 1 { |
| 2 "android_defaults": { | 2 "android_defaults": { |
| 3 "build_config_fs": "Release_x64", | 3 "build_config_fs": "Release_x64", |
| 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 "default_targets": [ | 7 "default_targets": [ |
| 8 "All" | 8 "All" |
| 9 ] | 9 ] |
| 10 }, | 10 }, |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 "build_tool": "make", | 308 "build_tool": "make", |
| 309 "default_targets": [ | 309 "default_targets": [ |
| 310 "buildbot" | 310 "buildbot" |
| 311 ] | 311 ] |
| 312 }, | 312 }, |
| 313 "gyp_env": { | 313 "gyp_env": { |
| 314 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64", | 314 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64", |
| 315 "GYP_MSVS_VERSION": "2012" | 315 "GYP_MSVS_VERSION": "2012" |
| 316 } | 316 } |
| 317 }, | 317 }, |
| 318 "webrtc_android_apk_try_builder": { |
| 319 "build_config_fs": "Release_x64", |
| 320 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 321 "compile_py": { |
| 322 "build_tool": "ninja", |
| 323 "compiler": "goma", |
| 324 "default_targets": [ |
| 325 "android_builder_webrtc" |
| 326 ] |
| 327 }, |
| 328 "gyp_env": { |
| 329 "GYP_CROSSCOMPILE": "1", |
| 330 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas
tbuild=1 gcc_version=46 host_os=linux include_tests=1 order_text_section=Path('[
CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm", |
| 331 "GYP_GENERATORS": "ninja", |
| 332 "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc", |
| 333 "GYP_MSVS_VERSION": "2012" |
| 334 } |
| 335 }, |
| 336 "webrtc_android_defaults": { |
| 337 "build_config_fs": "Release_x64", |
| 338 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 339 "compile_py": { |
| 340 "build_tool": "ninja", |
| 341 "default_targets": [ |
| 342 "All" |
| 343 ] |
| 344 }, |
| 345 "gyp_env": { |
| 346 "GYP_CROSSCOMPILE": "1", |
| 347 "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", |
| 348 "GYP_GENERATORS": "ninja", |
| 349 "GYP_GENERATOR_FLAGS": "default_target=All", |
| 350 "GYP_MSVS_VERSION": "2012" |
| 351 } |
| 352 }, |
| 318 "x86_builder": { | 353 "x86_builder": { |
| 319 "build_config_fs": "Release_x64", | 354 "build_config_fs": "Release_x64", |
| 320 "build_dir": "Path('[CHECKOUT]', 'out')", | 355 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 321 "compile_py": { | 356 "compile_py": { |
| 322 "build_tool": "ninja", | 357 "build_tool": "ninja", |
| 323 "compiler": "goma", | 358 "compiler": "goma", |
| 324 "default_targets": [ | 359 "default_targets": [ |
| 325 "All" | 360 "All" |
| 326 ] | 361 ] |
| 327 }, | 362 }, |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 "gyp_env": { | 398 "gyp_env": { |
| 364 "GYP_CROSSCOMPILE": "1", | 399 "GYP_CROSSCOMPILE": "1", |
| 365 "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", | 400 "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", |
| 366 "GYP_GENERATORS": "ninja", | 401 "GYP_GENERATORS": "ninja", |
| 367 "GYP_GENERATOR_FLAGS": "default_target=All", | 402 "GYP_GENERATOR_FLAGS": "default_target=All", |
| 368 "GYP_MSVS_VERSION": "2012" | 403 "GYP_MSVS_VERSION": "2012" |
| 369 } | 404 } |
| 370 }, | 405 }, |
| 371 "xcodebuild": "can not use xcodebuild on \"win\"" | 406 "xcodebuild": "can not use xcodebuild on \"win\"" |
| 372 } | 407 } |
| OLD | NEW |