Chromium Code Reviews| Index: scripts/slave/recipe_modules/chromium_android/config.py |
| diff --git a/scripts/slave/recipe_modules/chromium_android/config.py b/scripts/slave/recipe_modules/chromium_android/config.py |
| index 4bbbd3ae071aeb2c80832a9cf8a5f41f30ad869b..120889522ed4d5d228c457afc2f3cf45b673819f 100644 |
| --- a/scripts/slave/recipe_modules/chromium_android/config.py |
| +++ b/scripts/slave/recipe_modules/chromium_android/config.py |
| @@ -5,17 +5,21 @@ |
| from slave.recipe_config import config_item_context, ConfigGroup |
| from slave.recipe_config import Dict, Single, Static |
| +from slave.recipe_config_types import Path |
|
agable
2013/09/26 21:46:02
No empty line above this.
iannucci
2013/09/27 02:08:20
Done.
|
| + |
| def BaseConfig(INTERNAL, REPO_NAME, REPO_URL, **_kwargs): |
| return ConfigGroup( |
| INTERNAL = Static(INTERNAL), |
| REPO_NAME = Static(REPO_NAME), |
| REPO_URL = Static(REPO_URL), |
| target_arch = Single(basestring, required=False, empty_val=''), |
| - extra_env = Dict(value_type=(basestring,int,list)), |
| + extra_env = Dict(value_type=(basestring,int,Path)), |
| run_findbugs = Single(bool, required=False, empty_val=False), |
| run_lint = Single(bool, required=False, empty_val=False), |
| run_checkdeps = Single(bool, required=False, empty_val=False), |
| - apply_svn_patch = Single(bool, required=False, empty_val=False) |
| + apply_svn_patch = Single(bool, required=False, empty_val=False), |
| + build_internal_android = Static(Path('build_internal', |
| + 'scripts', 'slave', 'android')) |
| ) |
| @@ -57,7 +61,8 @@ def x86_builder(c): |
| def klp_builder(c): |
| c.extra_env = { |
| 'ANDROID_SDK_BUILD_TOOLS_VERSION': 'android-KeyLimePie', |
| - 'ANDROID_SDK_ROOT': ['third_party', 'android_tools_internal', 'sdk'], |
| + 'ANDROID_SDK_ROOT': Path('checkout', 'third_party', |
| + 'android_tools_internal', 'sdk'), |
| 'ANDROID_SDK_VERSION': 'KeyLimePie' |
| } |