| 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 import config_item_context, ConfigGroup | 5 from slave.recipe_config import config_item_context, ConfigGroup |
| 6 from slave.recipe_config import ConfigList, Dict, List, Single, Static | 6 from slave.recipe_config import ConfigList, Dict, List, Single, Static |
| 7 from slave.recipe_config_types import Path | 7 from slave.recipe_config_types import Path |
| 8 | 8 |
| 9 def BaseConfig(INTERNAL, REPO_NAME, REPO_URL, **_kwargs): | 9 def BaseConfig(INTERNAL, REPO_NAME, REPO_URL, **_kwargs): |
| 10 return ConfigGroup( | 10 return ConfigGroup( |
| 11 INTERNAL = Static(INTERNAL), | 11 INTERNAL = Static(INTERNAL), |
| 12 REPO_NAME = Static(REPO_NAME), | 12 REPO_NAME = Static(REPO_NAME), |
| 13 REPO_URL = Static(REPO_URL), | 13 REPO_URL = Static(REPO_URL), |
| 14 target_arch = Single(basestring, required=False, empty_val=''), | |
| 15 extra_env = Dict(value_type=(basestring,int,Path)), | 14 extra_env = Dict(value_type=(basestring,int,Path)), |
| 16 run_findbugs = Single(bool, required=False, empty_val=False), | 15 run_findbugs = Single(bool, required=False, empty_val=False), |
| 17 run_lint = Single(bool, required=False, empty_val=False), | 16 run_lint = Single(bool, required=False, empty_val=False), |
| 18 run_checkdeps = Single(bool, required=False, empty_val=False), | 17 run_checkdeps = Single(bool, required=False, empty_val=False), |
| 19 apply_svn_patch = Single(bool, required=False, empty_val=False), | 18 apply_svn_patch = Single(bool, required=False, empty_val=False), |
| 20 run_stack_tool_steps = Single(bool, required=False, empty_val=False), | 19 run_stack_tool_steps = Single(bool, required=False, empty_val=False), |
| 21 asan_symbolize = Single(bool, required=False, empty_val=False), | 20 asan_symbolize = Single(bool, required=False, empty_val=False), |
| 22 extra_deploy_opts = List(inner_type=basestring), | 21 extra_deploy_opts = List(inner_type=basestring), |
| 23 tests = List(inner_type=basestring), | 22 tests = List(inner_type=basestring), |
| 24 build_internal_android = Static(Path('[BUILD_INTERNAL]', | 23 build_internal_android = Static(Path('[BUILD_INTERNAL]', |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 c.run_findbugs = True | 57 c.run_findbugs = True |
| 59 c.run_lint = True | 58 c.run_lint = True |
| 60 c.run_checkdeps = True | 59 c.run_checkdeps = True |
| 61 | 60 |
| 62 @config_ctx() | 61 @config_ctx() |
| 63 def component_builder(c): | 62 def component_builder(c): |
| 64 pass | 63 pass |
| 65 | 64 |
| 66 @config_ctx() | 65 @config_ctx() |
| 67 def x86_base(c): | 66 def x86_base(c): |
| 68 c.target_arch = 'x86' | 67 pass |
| 69 | 68 |
| 70 @config_ctx(includes=['x86_base']) | 69 @config_ctx(includes=['x86_base']) |
| 71 def x86_builder(c): | 70 def x86_builder(c): |
| 72 pass | 71 pass |
| 73 | 72 |
| 74 @config_ctx() | 73 @config_ctx() |
| 75 def klp_builder(c): | 74 def klp_builder(c): |
| 76 c.extra_env = { | 75 c.extra_env = { |
| 77 'ANDROID_SDK_BUILD_TOOLS_VERSION': 'android-4.4', | 76 'ANDROID_SDK_BUILD_TOOLS_VERSION': 'android-4.4', |
| 78 'ANDROID_SDK_ROOT': Path( | 77 'ANDROID_SDK_ROOT': Path( |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 c.extra_deploy_opts = ['--await-internet'] | 119 c.extra_deploy_opts = ['--await-internet'] |
| 121 c.tests.append('enormous_instrumentation_tests') | 120 c.tests.append('enormous_instrumentation_tests') |
| 122 | 121 |
| 123 @config_ctx(includes=['try_base', 'instrumentation_tests']) | 122 @config_ctx(includes=['try_base', 'instrumentation_tests']) |
| 124 def try_instrumentation_tests(c): | 123 def try_instrumentation_tests(c): |
| 125 pass | 124 pass |
| 126 | 125 |
| 127 @config_ctx(includes=['x86_base', 'try_base', 'instrumentation_tests']) | 126 @config_ctx(includes=['x86_base', 'try_base', 'instrumentation_tests']) |
| 128 def x86_try_instrumentation_tests(c): | 127 def x86_try_instrumentation_tests(c): |
| 129 c.extra_deploy_opts.append('--non-rooted') | 128 c.extra_deploy_opts.append('--non-rooted') |
| OLD | NEW |