| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import pipes | 5 import pipes |
| 6 | 6 |
| 7 from slave.recipe_config import config_item_context, ConfigGroup | 7 from slave.recipe_config import config_item_context, ConfigGroup |
| 8 from slave.recipe_config import Dict, Single, Static, Set, BadConf | 8 from slave.recipe_config import Dict, Single, Static, Set, BadConf |
| 9 from slave.recipe_config_types import Path | 9 from slave.recipe_config_types import Path |
| 10 | 10 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 compile_py = ConfigGroup( | 32 compile_py = ConfigGroup( |
| 33 default_targets = Set(basestring), | 33 default_targets = Set(basestring), |
| 34 build_tool = Single(basestring), | 34 build_tool = Single(basestring), |
| 35 compiler = Single(basestring, required=False), | 35 compiler = Single(basestring, required=False), |
| 36 mode = Single(basestring, required=False), | 36 mode = Single(basestring, required=False), |
| 37 goma_dir = Single(Path, required=False), | 37 goma_dir = Single(Path, required=False), |
| 38 clobber = Single(bool, empty_val=False, required=False, hidden=False), | 38 clobber = Single(bool, empty_val=False, required=False, hidden=False), |
| 39 ), | 39 ), |
| 40 gyp_env = ConfigGroup( | 40 gyp_env = ConfigGroup( |
| 41 GYP_CROSSCOMPILE = Single(int, jsonish_fn=str, required=False), | 41 GYP_CROSSCOMPILE = Single(int, jsonish_fn=str, required=False), |
| 42 GYP_CHROMIUM_NO_ACTION = Single(int, jsonish_fn=str, required=False), |
| 42 GYP_DEFINES = Dict(equal_fn, ' '.join, (basestring,int,Path)), | 43 GYP_DEFINES = Dict(equal_fn, ' '.join, (basestring,int,Path)), |
| 43 GYP_GENERATORS = Set(basestring, ','.join), | 44 GYP_GENERATORS = Set(basestring, ','.join), |
| 44 GYP_GENERATOR_FLAGS = Dict(equal_fn, ' '.join, (basestring,int)), | 45 GYP_GENERATOR_FLAGS = Dict(equal_fn, ' '.join, (basestring,int)), |
| 45 GYP_MSVS_VERSION = Single(basestring, required=False), | 46 GYP_MSVS_VERSION = Single(basestring, required=False), |
| 46 ), | 47 ), |
| 47 build_dir = Single(Path), | 48 build_dir = Single(Path), |
| 48 | 49 |
| 49 # Some platforms do not have a 1:1 correlation of BUILD_CONFIG to what is | 50 # Some platforms do not have a 1:1 correlation of BUILD_CONFIG to what is |
| 50 # passed as --target on the command line. | 51 # passed as --target on the command line. |
| 51 build_config_fs = Single(basestring), | 52 build_config_fs = Single(basestring), |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 def android(c): | 324 def android(c): |
| 324 gyp_defs = c.gyp_env.GYP_DEFINES | 325 gyp_defs = c.gyp_env.GYP_DEFINES |
| 325 gyp_defs['fastbuild'] = 1 | 326 gyp_defs['fastbuild'] = 1 |
| 326 gyp_defs['OS'] = c.TARGET_PLATFORM | 327 gyp_defs['OS'] = c.TARGET_PLATFORM |
| 327 | 328 |
| 328 @config_ctx(includes=['ninja', 'shared_library', 'jsonclang']) | 329 @config_ctx(includes=['ninja', 'shared_library', 'jsonclang']) |
| 329 def codesearch(c): | 330 def codesearch(c): |
| 330 gyp_defs = c.gyp_env.GYP_DEFINES | 331 gyp_defs = c.gyp_env.GYP_DEFINES |
| 331 gyp_defs['fastbuild'] = 1 | 332 gyp_defs['fastbuild'] = 1 |
| 332 | 333 |
| OLD | NEW |