| 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 from slave.recipe_config_types import Path |
| 6 |
| 5 from RECIPE_MODULES.chromium import CONFIG_CTX | 7 from RECIPE_MODULES.chromium import CONFIG_CTX |
| 6 | 8 |
| 7 @CONFIG_CTX(includes=['ninja', 'static_library']) | 9 @CONFIG_CTX(includes=['ninja', 'static_library']) |
| 8 def android_defaults(c): | 10 def android_defaults(c): |
| 9 c.compile_py.default_targets=['All'] | 11 c.compile_py.default_targets=['All'] |
| 10 c.gyp_env.GYP_CROSSCOMPILE = 1 | 12 c.gyp_env.GYP_CROSSCOMPILE = 1 |
| 11 c.gyp_env.GYP_GENERATORS.add('ninja') | 13 c.gyp_env.GYP_GENERATORS.add('ninja') |
| 12 c.gyp_env.GYP_GENERATOR_FLAGS['default_target'] = 'All' | 14 c.gyp_env.GYP_GENERATOR_FLAGS['default_target'] = 'All' |
| 13 gyp_defs = c.gyp_env.GYP_DEFINES | 15 gyp_defs = c.gyp_env.GYP_DEFINES |
| 14 gyp_defs['fastbuild'] = 1 | 16 gyp_defs['fastbuild'] = 1 |
| 15 gyp_defs['OS'] = 'android' | 17 gyp_defs['OS'] = 'android' |
| 16 gyp_defs['host_os'] = 'linux' | 18 gyp_defs['host_os'] = 'linux' |
| 17 gyp_defs['gcc_version'] = 46 | 19 gyp_defs['gcc_version'] = 46 |
| 18 gyp_defs['order_text_section'] = ['orderfiles', 'orderfile.out'] | 20 gyp_defs['order_text_section'] = Path( |
| 21 'checkout', 'orderfiles', 'orderfile.out') |
| 19 gyp_defs['target_arch'] = 'arm' | 22 gyp_defs['target_arch'] = 'arm' |
| 20 | 23 |
| 21 | 24 |
| 22 @CONFIG_CTX(includes=['android_defaults', 'default_compiler', 'goma']) | 25 @CONFIG_CTX(includes=['android_defaults', 'default_compiler', 'goma']) |
| 23 def main_builder(c): | 26 def main_builder(c): |
| 24 pass | 27 pass |
| 25 | 28 |
| 26 @CONFIG_CTX(includes=['android_defaults', 'clang', 'goma']) | 29 @CONFIG_CTX(includes=['android_defaults', 'clang', 'goma']) |
| 27 def clang_builder(c): | 30 def clang_builder(c): |
| 28 pass | 31 pass |
| 29 | 32 |
| 30 @CONFIG_CTX(includes=['main_builder']) | 33 @CONFIG_CTX(includes=['main_builder']) |
| 31 def component_builder(c): | 34 def component_builder(c): |
| 32 c.gyp_env.GYP_DEFINES['component'] = 'shared_library' | 35 c.gyp_env.GYP_DEFINES['component'] = 'shared_library' |
| 33 | 36 |
| 34 @CONFIG_CTX(includes=['main_builder']) | 37 @CONFIG_CTX(includes=['main_builder']) |
| 35 def x86_builder(c): | 38 def x86_builder(c): |
| 36 c.gyp_env.GYP_DEFINES['target_arch'] = 'ia32' | 39 c.gyp_env.GYP_DEFINES['target_arch'] = 'ia32' |
| 37 | 40 |
| 38 @CONFIG_CTX(includes=['main_builder']) | 41 @CONFIG_CTX(includes=['main_builder']) |
| 39 def klp_builder(c): | 42 def klp_builder(c): |
| 40 gyp_defs = c.gyp_env.GYP_DEFINES | 43 gyp_defs = c.gyp_env.GYP_DEFINES |
| 41 gyp_defs['android_sdk_version'] = 'KeyLimePie' | 44 gyp_defs['android_sdk_version'] = 'KeyLimePie' |
| 42 gyp_defs['android_sdk_root'] = ['third_party', 'android_tools_internal', | 45 gyp_defs['android_sdk_root'] = Path( |
| 43 'sdk'] | 46 'checkout', 'third_party', 'android_tools_internal', 'sdk') |
| 44 | 47 |
| 45 @CONFIG_CTX(includes=['main_builder']) | 48 @CONFIG_CTX(includes=['main_builder']) |
| 46 def try_builder(c): | 49 def try_builder(c): |
| 47 pass | 50 pass |
| 48 | 51 |
| 49 @CONFIG_CTX(includes=['x86_builder', 'try_builder']) | 52 @CONFIG_CTX(includes=['x86_builder', 'try_builder']) |
| 50 def x86_try_builder(c): | 53 def x86_try_builder(c): |
| 51 pass | 54 pass |
| OLD | NEW |