Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: scripts/slave/recipe_modules/chromium_android/config.py

Issue 24737002: Add Paths as first-class types in configs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: license Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..338cca4e13d40c8fb8acca3e634be580389d73de 100644
--- a/scripts/slave/recipe_modules/chromium_android/config.py
+++ b/scripts/slave/recipe_modules/chromium_android/config.py
@@ -4,6 +4,7 @@
from slave.recipe_config import config_item_context, ConfigGroup
from slave.recipe_config import Dict, Single, Static
+from slave.recipe_config_types import Path
def BaseConfig(INTERNAL, REPO_NAME, REPO_URL, **_kwargs):
return ConfigGroup(
@@ -11,11 +12,13 @@ def BaseConfig(INTERNAL, REPO_NAME, REPO_URL, **_kwargs):
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 +60,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'
}

Powered by Google App Engine
This is Rietveld 408576698