| OLD | NEW |
| 1 { | 1 { |
| 2 "android": { |
| 3 "build_config_fs": "Release", |
| 4 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 5 "compile_py": { |
| 6 "build_tool": "ninja", |
| 7 "compiler": "goma" |
| 8 }, |
| 9 "gyp_env": { |
| 10 "GYP_CROSSCOMPILE": "1", |
| 11 "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=x64", |
| 12 "GYP_GENERATORS": "ninja" |
| 13 } |
| 14 }, |
| 2 "android_defaults": "Android cannot target 64 bits", | 15 "android_defaults": "Android cannot target 64 bits", |
| 3 "blink": { | 16 "blink": { |
| 4 "build_config_fs": "Release", | 17 "build_config_fs": "Release", |
| 5 "build_dir": "Path('[CHECKOUT]', 'out')", | 18 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 6 "compile_py": { | 19 "compile_py": { |
| 7 "build_tool": "ninja", | 20 "build_tool": "ninja", |
| 8 "compiler": "goma", | 21 "compiler": "goma", |
| 9 "default_targets": [ | 22 "default_targets": [ |
| 10 "blink_tests" | 23 "blink_tests" |
| 11 ] | 24 ] |
| 12 }, | 25 }, |
| 13 "gyp_env": { | 26 "gyp_env": { |
| 27 "GYP_CROSSCOMPILE": "1", |
| 14 "GYP_DEFINES": "component=static_library target_arch=x64", | 28 "GYP_DEFINES": "component=static_library target_arch=x64", |
| 15 "GYP_GENERATORS": "ninja" | 29 "GYP_GENERATORS": "ninja" |
| 16 } | 30 } |
| 17 }, | 31 }, |
| 18 "blink_clang": { | 32 "blink_clang": { |
| 19 "build_config_fs": "Release", | 33 "build_config_fs": "Release", |
| 20 "build_dir": "Path('[CHECKOUT]', 'out')", | 34 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 21 "compile_py": { | 35 "compile_py": { |
| 22 "build_tool": "ninja", | 36 "build_tool": "ninja", |
| 23 "compiler": "goma-clang", | 37 "compiler": "goma-clang", |
| 24 "default_targets": [ | 38 "default_targets": [ |
| 25 "blink_tests" | 39 "blink_tests" |
| 26 ] | 40 ] |
| 27 }, | 41 }, |
| 28 "gyp_env": { | 42 "gyp_env": { |
| 43 "GYP_CROSSCOMPILE": "1", |
| 29 "GYP_DEFINES": "clang=1 component=static_library target_arch=x64", | 44 "GYP_DEFINES": "clang=1 component=static_library target_arch=x64", |
| 30 "GYP_GENERATORS": "ninja" | 45 "GYP_GENERATORS": "ninja" |
| 31 } | 46 } |
| 32 }, | 47 }, |
| 33 "chromium": { | 48 "chromium": { |
| 34 "build_config_fs": "Release", | 49 "build_config_fs": "Release", |
| 35 "build_dir": "Path('[CHECKOUT]', 'out')", | 50 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 36 "compile_py": { | 51 "compile_py": { |
| 37 "build_tool": "ninja", | 52 "build_tool": "ninja", |
| 38 "compiler": "goma", | 53 "compiler": "goma", |
| 39 "default_targets": [ | 54 "default_targets": [ |
| 40 "All", | 55 "All", |
| 41 "chromium_builder_tests" | 56 "chromium_builder_tests" |
| 42 ] | 57 ] |
| 43 }, | 58 }, |
| 44 "gyp_env": { | 59 "gyp_env": { |
| 60 "GYP_CROSSCOMPILE": "1", |
| 45 "GYP_DEFINES": "component=static_library target_arch=x64", | 61 "GYP_DEFINES": "component=static_library target_arch=x64", |
| 46 "GYP_GENERATORS": "ninja" | 62 "GYP_GENERATORS": "ninja" |
| 47 } | 63 } |
| 48 }, | 64 }, |
| 49 "chromium_clang": { | 65 "chromium_clang": { |
| 50 "build_config_fs": "Release", | 66 "build_config_fs": "Release", |
| 51 "build_dir": "Path('[CHECKOUT]', 'out')", | 67 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 52 "compile_py": { | 68 "compile_py": { |
| 53 "build_tool": "ninja", | 69 "build_tool": "ninja", |
| 54 "compiler": "goma-clang", | 70 "compiler": "goma-clang", |
| 55 "default_targets": [ | 71 "default_targets": [ |
| 56 "All", | 72 "All", |
| 57 "chromium_builder_tests" | 73 "chromium_builder_tests" |
| 58 ] | 74 ] |
| 59 }, | 75 }, |
| 60 "gyp_env": { | 76 "gyp_env": { |
| 77 "GYP_CROSSCOMPILE": "1", |
| 61 "GYP_DEFINES": "clang=1 component=static_library target_arch=x64", | 78 "GYP_DEFINES": "clang=1 component=static_library target_arch=x64", |
| 62 "GYP_GENERATORS": "ninja" | 79 "GYP_GENERATORS": "ninja" |
| 63 } | 80 } |
| 64 }, | 81 }, |
| 65 "clang_builder": "config \"clang_builder\" includes \"android_defaults\", but
[Android cannot target 64 bits]", | 82 "clang_builder": "config \"clang_builder\" includes \"android_defaults\", but
[Android cannot target 64 bits]", |
| 66 "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \"
tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]
", | 83 "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \"
tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]
", |
| 67 "component_builder": "config \"component_builder\" includes \"main_builder\",
but [config \"main_builder\" includes \"android_defaults\", but [Android cannot
target 64 bits]]", | 84 "component_builder": "config \"component_builder\" includes \"main_builder\",
but [config \"main_builder\" includes \"android_defaults\", but [Android cannot
target 64 bits]]", |
| 68 "dartium_builder": "config \"dartium_builder\" includes \"main_builder\", but
[config \"main_builder\" includes \"android_defaults\", but [Android cannot targ
et 64 bits]]", | 85 "dartium_builder": "config \"dartium_builder\" includes \"main_builder\", but
[config \"main_builder\" includes \"android_defaults\", but [Android cannot targ
et 64 bits]]", |
| 69 "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [con
fig \"tests_base\" includes \"android_defaults\", but [Android cannot target 64
bits]]", | 86 "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [con
fig \"tests_base\" includes \"android_defaults\", but [Android cannot target 64
bits]]", |
| 70 "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config
\"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bi
ts]]", | 87 "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config
\"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bi
ts]]", |
| 71 "main_builder": "config \"main_builder\" includes \"android_defaults\", but [A
ndroid cannot target 64 bits]", | 88 "main_builder": "config \"main_builder\" includes \"android_defaults\", but [A
ndroid cannot target 64 bits]", |
| 72 "main_tests": "config \"main_tests\" includes \"tests_base\", but [config \"te
sts_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
| 89 "main_tests": "config \"main_tests\" includes \"tests_base\", but [config \"te
sts_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
|
| 73 "msvs": "can not use msvs on \"linux\"", | 90 "msvs": "can not use msvs on \"linux\"", |
| 74 "ninja": { | 91 "ninja": { |
| 75 "build_config_fs": "Release", | 92 "build_config_fs": "Release", |
| 76 "build_dir": "Path('[CHECKOUT]', 'out')", | 93 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 77 "compile_py": { | 94 "compile_py": { |
| 78 "build_tool": "ninja" | 95 "build_tool": "ninja" |
| 79 }, | 96 }, |
| 80 "gyp_env": { | 97 "gyp_env": { |
| 98 "GYP_CROSSCOMPILE": "1", |
| 81 "GYP_DEFINES": "component=static_library target_arch=x64", | 99 "GYP_DEFINES": "component=static_library target_arch=x64", |
| 82 "GYP_GENERATORS": "ninja" | 100 "GYP_GENERATORS": "ninja" |
| 83 } | 101 } |
| 84 }, | 102 }, |
| 85 "tests_base": "config \"tests_base\" includes \"android_defaults\", but [Andro
id cannot target 64 bits]", | 103 "tests_base": "config \"tests_base\" includes \"android_defaults\", but [Andro
id cannot target 64 bits]", |
| 86 "try_builder": "config \"try_builder\" includes \"main_builder\", but [config
\"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bi
ts]]", | 104 "try_builder": "config \"try_builder\" includes \"main_builder\", but [config
\"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bi
ts]]", |
| 87 "try_instrumentation_tests": "config \"try_instrumentation_tests\" includes \"
tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [And
roid cannot target 64 bits]]", | 105 "try_instrumentation_tests": "config \"try_instrumentation_tests\" includes \"
tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [And
roid cannot target 64 bits]]", |
| 88 "v8": { | 106 "v8": { |
| 89 "build_config_fs": "Release", | 107 "build_config_fs": "Release", |
| 90 "build_dir": "Path('[CHECKOUT]')", | 108 "build_dir": "Path('[CHECKOUT]')", |
| 91 "compile_py": { | 109 "compile_py": { |
| 92 "build_tool": "make" | 110 "build_tool": "make" |
| 93 }, | 111 }, |
| 94 "gyp_env": { | 112 "gyp_env": { |
| 113 "GYP_CROSSCOMPILE": "1", |
| 95 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64" | 114 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64" |
| 96 } | 115 } |
| 97 }, | 116 }, |
| 117 "webrtc_android_apk_try_builder": { |
| 118 "build_config_fs": "Release", |
| 119 "build_dir": "Path('[CHECKOUT]', 'out')", |
| 120 "compile_py": { |
| 121 "build_tool": "ninja", |
| 122 "compiler": "goma", |
| 123 "default_targets": [ |
| 124 "android_builder_webrtc" |
| 125 ] |
| 126 }, |
| 127 "gyp_env": { |
| 128 "GYP_CROSSCOMPILE": "1", |
| 129 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio
n=46 host_os=linux include_tests=1 order_text_section=Path('[CHECKOUT]', 'orderf
iles', 'orderfile.out') target_arch=x64", |
| 130 "GYP_GENERATORS": "ninja", |
| 131 "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc" |
| 132 } |
| 133 }, |
| 98 "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [And
roid cannot target 64 bits]", | 134 "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [And
roid cannot target 64 bits]", |
| 99 "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [
config \"x86_builder\" includes \"android_defaults\", but [Android cannot target
64 bits]]", | 135 "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [
config \"x86_builder\" includes \"android_defaults\", but [Android cannot target
64 bits]]", |
| 100 "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]]", | 136 "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]]", |
| 101 "xcodebuild": "can not use xcodebuild on \"linux\"" | 137 "xcodebuild": "can not use xcodebuild on \"linux\"" |
| 102 } | 138 } |
| OLD | NEW |