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

Unified Diff: scripts/slave/recipe_modules/chromium_android/chromium_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/chromium_config.py
diff --git a/scripts/slave/recipe_modules/chromium_android/chromium_config.py b/scripts/slave/recipe_modules/chromium_android/chromium_config.py
index 7a1ad3ad7d0c076c6d1db32a0e81c219d21c3316..9e656e258cf86beb38ae02b5eec53beae01bcdc7 100644
--- a/scripts/slave/recipe_modules/chromium_android/chromium_config.py
+++ b/scripts/slave/recipe_modules/chromium_android/chromium_config.py
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+from slave.recipe_config_types import Path
+
from RECIPE_MODULES.chromium import CONFIG_CTX
@CONFIG_CTX(includes=['ninja', 'static_library'])
@@ -15,9 +17,10 @@ def android_defaults(c):
gyp_defs['OS'] = 'android'
gyp_defs['host_os'] = 'linux'
gyp_defs['gcc_version'] = 46
- gyp_defs['order_text_section'] = ['orderfiles', 'orderfile.out']
+ gyp_defs['order_text_section'] = Path(
+ '[CHECKOUT]', 'orderfiles', 'orderfile.out')
gyp_defs['target_arch'] = 'arm'
-
+
@CONFIG_CTX(includes=['android_defaults', 'default_compiler', 'goma'])
def main_builder(c):
@@ -39,8 +42,8 @@ def x86_builder(c):
def klp_builder(c):
gyp_defs = c.gyp_env.GYP_DEFINES
gyp_defs['android_sdk_version'] = 'KeyLimePie'
- gyp_defs['android_sdk_root'] = ['third_party', 'android_tools_internal',
- 'sdk']
+ gyp_defs['android_sdk_root'] = Path(
+ '[CHECKOUT]', 'third_party', 'android_tools_internal', 'sdk')
@CONFIG_CTX(includes=['main_builder'])
def try_builder(c):
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/api.py ('k') | scripts/slave/recipe_modules/chromium_android/config.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698