| 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": "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 }, |
| 11 "gyp_env": { | 11 "gyp_env": { |
| 12 "GYP_CROSSCOMPILE": "1", | 12 "GYP_CROSSCOMPILE": "1", |
| 13 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio
n=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arc
h=arm", | 13 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio
n=46 host_os=linux order_text_section=Path([CHECKOUT], ('orderfiles', 'orderfile
.out')) target_arch=arm", |
| 14 "GYP_GENERATORS": "ninja", | 14 "GYP_GENERATORS": "ninja", |
| 15 "GYP_GENERATOR_FLAGS": "default_target=All", | 15 "GYP_GENERATOR_FLAGS": "default_target=All", |
| 16 "GYP_MSVS_VERSION": "2012" | 16 "GYP_MSVS_VERSION": "2012" |
| 17 } | 17 } |
| 18 }, | 18 }, |
| 19 "blink": { | 19 "blink": { |
| 20 "build_config_fs": "Release_x64", | 20 "build_config_fs": "Release_x64", |
| 21 "build_dir": "out", | 21 "build_dir": "Path([CHECKOUT], ('out',))", |
| 22 "compile_py": { | 22 "compile_py": { |
| 23 "build_tool": "ninja", | 23 "build_tool": "ninja", |
| 24 "compiler": "goma", | 24 "compiler": "goma", |
| 25 "default_targets": [ | 25 "default_targets": [ |
| 26 "all_webkit" | 26 "all_webkit" |
| 27 ] | 27 ] |
| 28 }, | 28 }, |
| 29 "gyp_env": { | 29 "gyp_env": { |
| 30 "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 ta
rget_arch=x64 use_ash=0 use_aura=0", | 30 "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 ta
rget_arch=x64 use_ash=0 use_aura=0", |
| 31 "GYP_GENERATORS": "ninja", | 31 "GYP_GENERATORS": "ninja", |
| 32 "GYP_MSVS_VERSION": "2012" | 32 "GYP_MSVS_VERSION": "2012" |
| 33 } | 33 } |
| 34 }, | 34 }, |
| 35 "chromium": { | 35 "chromium": { |
| 36 "build_config_fs": "Release_x64", | 36 "build_config_fs": "Release_x64", |
| 37 "build_dir": "out", | 37 "build_dir": "Path([CHECKOUT], ('out',))", |
| 38 "compile_py": { | 38 "compile_py": { |
| 39 "build_tool": "ninja", | 39 "build_tool": "ninja", |
| 40 "compiler": "goma", | 40 "compiler": "goma", |
| 41 "default_targets": [ | 41 "default_targets": [ |
| 42 "All", | 42 "All", |
| 43 "chromium_builder_tests" | 43 "chromium_builder_tests" |
| 44 ] | 44 ] |
| 45 }, | 45 }, |
| 46 "gyp_env": { | 46 "gyp_env": { |
| 47 "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 ta
rget_arch=x64", | 47 "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 ta
rget_arch=x64", |
| 48 "GYP_GENERATORS": "ninja", | 48 "GYP_GENERATORS": "ninja", |
| 49 "GYP_MSVS_VERSION": "2012" | 49 "GYP_MSVS_VERSION": "2012" |
| 50 } | 50 } |
| 51 }, | 51 }, |
| 52 "clang_builder": { | 52 "clang_builder": { |
| 53 "build_config_fs": "Release_x64", | 53 "build_config_fs": "Release_x64", |
| 54 "build_dir": "out", | 54 "build_dir": "Path([CHECKOUT], ('out',))", |
| 55 "compile_py": { | 55 "compile_py": { |
| 56 "build_tool": "ninja", | 56 "build_tool": "ninja", |
| 57 "compiler": "goma-clang", | 57 "compiler": "goma-clang", |
| 58 "default_targets": [ | 58 "default_targets": [ |
| 59 "All" | 59 "All" |
| 60 ] | 60 ] |
| 61 }, | 61 }, |
| 62 "gyp_env": { | 62 "gyp_env": { |
| 63 "GYP_CROSSCOMPILE": "1", | 63 "GYP_CROSSCOMPILE": "1", |
| 64 "GYP_DEFINES": "OS=android chromium_win_pch=0 clang=1 component=static_lib
rary fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles',
'orderfile.out'] target_arch=arm", | 64 "GYP_DEFINES": "OS=android chromium_win_pch=0 clang=1 component=static_lib
rary fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path([CHECKOUT]
, ('orderfiles', 'orderfile.out')) target_arch=arm", |
| 65 "GYP_GENERATORS": "ninja", | 65 "GYP_GENERATORS": "ninja", |
| 66 "GYP_GENERATOR_FLAGS": "default_target=All", | 66 "GYP_GENERATOR_FLAGS": "default_target=All", |
| 67 "GYP_MSVS_VERSION": "2012" | 67 "GYP_MSVS_VERSION": "2012" |
| 68 } | 68 } |
| 69 }, | 69 }, |
| 70 "component_builder": { | 70 "component_builder": { |
| 71 "build_config_fs": "Release_x64", | 71 "build_config_fs": "Release_x64", |
| 72 "build_dir": "out", | 72 "build_dir": "Path([CHECKOUT], ('out',))", |
| 73 "compile_py": { | 73 "compile_py": { |
| 74 "build_tool": "ninja", | 74 "build_tool": "ninja", |
| 75 "compiler": "goma", | 75 "compiler": "goma", |
| 76 "default_targets": [ | 76 "default_targets": [ |
| 77 "All" | 77 "All" |
| 78 ] | 78 ] |
| 79 }, | 79 }, |
| 80 "gyp_env": { | 80 "gyp_env": { |
| 81 "GYP_CROSSCOMPILE": "1", | 81 "GYP_CROSSCOMPILE": "1", |
| 82 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=shared_library fas
tbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfi
le.out'] target_arch=arm", | 82 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=shared_library fas
tbuild=1 gcc_version=46 host_os=linux order_text_section=Path([CHECKOUT], ('orde
rfiles', 'orderfile.out')) target_arch=arm", |
| 83 "GYP_GENERATORS": "ninja", | 83 "GYP_GENERATORS": "ninja", |
| 84 "GYP_GENERATOR_FLAGS": "default_target=All", | 84 "GYP_GENERATOR_FLAGS": "default_target=All", |
| 85 "GYP_MSVS_VERSION": "2012" | 85 "GYP_MSVS_VERSION": "2012" |
| 86 } | 86 } |
| 87 }, | 87 }, |
| 88 "klp_builder": { | 88 "klp_builder": { |
| 89 "build_config_fs": "Release_x64", | 89 "build_config_fs": "Release_x64", |
| 90 "build_dir": "out", | 90 "build_dir": "Path([CHECKOUT], ('out',))", |
| 91 "compile_py": { | 91 "compile_py": { |
| 92 "build_tool": "ninja", | 92 "build_tool": "ninja", |
| 93 "compiler": "goma", | 93 "compiler": "goma", |
| 94 "default_targets": [ | 94 "default_targets": [ |
| 95 "All" | 95 "All" |
| 96 ] | 96 ] |
| 97 }, | 97 }, |
| 98 "gyp_env": { | 98 "gyp_env": { |
| 99 "GYP_CROSSCOMPILE": "1", | 99 "GYP_CROSSCOMPILE": "1", |
| 100 "GYP_DEFINES": "OS=android android_sdk_root=['third_party', 'android_tools
_internal', 'sdk'] android_sdk_version=KeyLimePie chromium_win_pch=0 component=s
tatic_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orde
rfiles', 'orderfile.out'] target_arch=arm", | 100 "GYP_DEFINES": "OS=android android_sdk_root=Path([CHECKOUT], ('third_party
', 'android_tools_internal', 'sdk')) android_sdk_version=KeyLimePie chromium_win
_pch=0 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_t
ext_section=Path([CHECKOUT], ('orderfiles', 'orderfile.out')) target_arch=arm", |
| 101 "GYP_GENERATORS": "ninja", | 101 "GYP_GENERATORS": "ninja", |
| 102 "GYP_GENERATOR_FLAGS": "default_target=All", | 102 "GYP_GENERATOR_FLAGS": "default_target=All", |
| 103 "GYP_MSVS_VERSION": "2012" | 103 "GYP_MSVS_VERSION": "2012" |
| 104 } | 104 } |
| 105 }, | 105 }, |
| 106 "main_builder": { | 106 "main_builder": { |
| 107 "build_config_fs": "Release_x64", | 107 "build_config_fs": "Release_x64", |
| 108 "build_dir": "out", | 108 "build_dir": "Path([CHECKOUT], ('out',))", |
| 109 "compile_py": { | 109 "compile_py": { |
| 110 "build_tool": "ninja", | 110 "build_tool": "ninja", |
| 111 "compiler": "goma", | 111 "compiler": "goma", |
| 112 "default_targets": [ | 112 "default_targets": [ |
| 113 "All" | 113 "All" |
| 114 ] | 114 ] |
| 115 }, | 115 }, |
| 116 "gyp_env": { | 116 "gyp_env": { |
| 117 "GYP_CROSSCOMPILE": "1", | 117 "GYP_CROSSCOMPILE": "1", |
| 118 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas
tbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfi
le.out'] target_arch=arm", | 118 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas
tbuild=1 gcc_version=46 host_os=linux order_text_section=Path([CHECKOUT], ('orde
rfiles', 'orderfile.out')) target_arch=arm", |
| 119 "GYP_GENERATORS": "ninja", | 119 "GYP_GENERATORS": "ninja", |
| 120 "GYP_GENERATOR_FLAGS": "default_target=All", | 120 "GYP_GENERATOR_FLAGS": "default_target=All", |
| 121 "GYP_MSVS_VERSION": "2012" | 121 "GYP_MSVS_VERSION": "2012" |
| 122 } | 122 } |
| 123 }, | 123 }, |
| 124 "msvs": { | 124 "msvs": { |
| 125 "build_config_fs": "Release_x64", | 125 "build_config_fs": "Release_x64", |
| 126 "build_dir": "out", | 126 "build_dir": "Path([CHECKOUT], ('build',))", |
| 127 "compile_py": { | 127 "compile_py": { |
| 128 "build_tool": "msvs" | 128 "build_tool": "msvs" |
| 129 }, | 129 }, |
| 130 "gyp_env": { | 130 "gyp_env": { |
| 131 "GYP_DEFINES": "component=static_library target_arch=x64", | 131 "GYP_DEFINES": "component=static_library target_arch=x64", |
| 132 "GYP_GENERATORS": "msvs", | 132 "GYP_GENERATORS": "msvs", |
| 133 "GYP_GENERATOR_FLAGS": "msvs_error_on_missing_sources=1", | 133 "GYP_GENERATOR_FLAGS": "msvs_error_on_missing_sources=1", |
| 134 "GYP_MSVS_VERSION": "2012" | 134 "GYP_MSVS_VERSION": "2012" |
| 135 } | 135 } |
| 136 }, | 136 }, |
| 137 "ninja": { | 137 "ninja": { |
| 138 "build_config_fs": "Release_x64", | 138 "build_config_fs": "Release_x64", |
| 139 "build_dir": "out", | 139 "build_dir": "Path([CHECKOUT], ('out',))", |
| 140 "compile_py": { | 140 "compile_py": { |
| 141 "build_tool": "ninja" | 141 "build_tool": "ninja" |
| 142 }, | 142 }, |
| 143 "gyp_env": { | 143 "gyp_env": { |
| 144 "GYP_DEFINES": "component=static_library target_arch=x64", | 144 "GYP_DEFINES": "component=static_library target_arch=x64", |
| 145 "GYP_GENERATORS": "ninja", | 145 "GYP_GENERATORS": "ninja", |
| 146 "GYP_MSVS_VERSION": "2012" | 146 "GYP_MSVS_VERSION": "2012" |
| 147 } | 147 } |
| 148 }, | 148 }, |
| 149 "try_builder": { | 149 "try_builder": { |
| 150 "build_config_fs": "Release_x64", | 150 "build_config_fs": "Release_x64", |
| 151 "build_dir": "out", | 151 "build_dir": "Path([CHECKOUT], ('out',))", |
| 152 "compile_py": { | 152 "compile_py": { |
| 153 "build_tool": "ninja", | 153 "build_tool": "ninja", |
| 154 "compiler": "goma", | 154 "compiler": "goma", |
| 155 "default_targets": [ | 155 "default_targets": [ |
| 156 "All" | 156 "All" |
| 157 ] | 157 ] |
| 158 }, | 158 }, |
| 159 "gyp_env": { | 159 "gyp_env": { |
| 160 "GYP_CROSSCOMPILE": "1", | 160 "GYP_CROSSCOMPILE": "1", |
| 161 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas
tbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfi
le.out'] target_arch=arm", | 161 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas
tbuild=1 gcc_version=46 host_os=linux order_text_section=Path([CHECKOUT], ('orde
rfiles', 'orderfile.out')) target_arch=arm", |
| 162 "GYP_GENERATORS": "ninja", | 162 "GYP_GENERATORS": "ninja", |
| 163 "GYP_GENERATOR_FLAGS": "default_target=All", | 163 "GYP_GENERATOR_FLAGS": "default_target=All", |
| 164 "GYP_MSVS_VERSION": "2012" | 164 "GYP_MSVS_VERSION": "2012" |
| 165 } | 165 } |
| 166 }, | 166 }, |
| 167 "v8": { | 167 "v8": { |
| 168 "build_config_fs": "Release", | 168 "build_config_fs": "Release", |
| 169 "build_dir": "", | 169 "build_dir": "Path([CHECKOUT], ())", |
| 170 "compile_py": { | 170 "compile_py": { |
| 171 "build_tool": "make", | 171 "build_tool": "make", |
| 172 "default_targets": [ | 172 "default_targets": [ |
| 173 "buildbot" | 173 "buildbot" |
| 174 ] | 174 ] |
| 175 }, | 175 }, |
| 176 "gyp_env": { | 176 "gyp_env": { |
| 177 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64", | 177 "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64", |
| 178 "GYP_MSVS_VERSION": "2012" | 178 "GYP_MSVS_VERSION": "2012" |
| 179 } | 179 } |
| 180 }, | 180 }, |
| 181 "x86_builder": { | 181 "x86_builder": { |
| 182 "build_config_fs": "Release_x64", | 182 "build_config_fs": "Release_x64", |
| 183 "build_dir": "out", | 183 "build_dir": "Path([CHECKOUT], ('out',))", |
| 184 "compile_py": { | 184 "compile_py": { |
| 185 "build_tool": "ninja", | 185 "build_tool": "ninja", |
| 186 "compiler": "goma", | 186 "compiler": "goma", |
| 187 "default_targets": [ | 187 "default_targets": [ |
| 188 "All" | 188 "All" |
| 189 ] | 189 ] |
| 190 }, | 190 }, |
| 191 "gyp_env": { | 191 "gyp_env": { |
| 192 "GYP_CROSSCOMPILE": "1", | 192 "GYP_CROSSCOMPILE": "1", |
| 193 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas
tbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfi
le.out'] target_arch=ia32", | 193 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas
tbuild=1 gcc_version=46 host_os=linux order_text_section=Path([CHECKOUT], ('orde
rfiles', 'orderfile.out')) target_arch=ia32", |
| 194 "GYP_GENERATORS": "ninja", | 194 "GYP_GENERATORS": "ninja", |
| 195 "GYP_GENERATOR_FLAGS": "default_target=All", | 195 "GYP_GENERATOR_FLAGS": "default_target=All", |
| 196 "GYP_MSVS_VERSION": "2012" | 196 "GYP_MSVS_VERSION": "2012" |
| 197 } | 197 } |
| 198 }, | 198 }, |
| 199 "x86_try_builder": { | 199 "x86_try_builder": { |
| 200 "build_config_fs": "Release_x64", | 200 "build_config_fs": "Release_x64", |
| 201 "build_dir": "out", | 201 "build_dir": "Path([CHECKOUT], ('out',))", |
| 202 "compile_py": { | 202 "compile_py": { |
| 203 "build_tool": "ninja", | 203 "build_tool": "ninja", |
| 204 "compiler": "goma", | 204 "compiler": "goma", |
| 205 "default_targets": [ | 205 "default_targets": [ |
| 206 "All" | 206 "All" |
| 207 ] | 207 ] |
| 208 }, | 208 }, |
| 209 "gyp_env": { | 209 "gyp_env": { |
| 210 "GYP_CROSSCOMPILE": "1", | 210 "GYP_CROSSCOMPILE": "1", |
| 211 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas
tbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfi
le.out'] target_arch=ia32", | 211 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fas
tbuild=1 gcc_version=46 host_os=linux order_text_section=Path([CHECKOUT], ('orde
rfiles', 'orderfile.out')) target_arch=ia32", |
| 212 "GYP_GENERATORS": "ninja", | 212 "GYP_GENERATORS": "ninja", |
| 213 "GYP_GENERATOR_FLAGS": "default_target=All", | 213 "GYP_GENERATOR_FLAGS": "default_target=All", |
| 214 "GYP_MSVS_VERSION": "2012" | 214 "GYP_MSVS_VERSION": "2012" |
| 215 } | 215 } |
| 216 }, | 216 }, |
| 217 "xcodebuild": "can not use xcodebuild on \"win\"" | 217 "xcodebuild": "can not use xcodebuild on \"win\"" |
| 218 } | 218 } |
| OLD | NEW |