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

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

Issue 23431038: [chromium_android recipes] Cleanup envsetup step and cleanup step names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Address comments 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 e97d82b08dbc6e0db4e742d5f0b832317857e86e..ae2ed3cea93a8afe99817c7c48a9605056a1d815 100644
--- a/scripts/slave/recipe_modules/chromium_android/chromium_config.py
+++ b/scripts/slave/recipe_modules/chromium_android/chromium_config.py
@@ -7,7 +7,17 @@ from RECIPE_MODULES.chromium import CONFIG_CTX
@CONFIG_CTX(includes=['ninja'])
def android_defaults(c):
c.compile_py.default_targets=['All']
- c.gyp_env.GYP_DEFINES['fastbuild'] = 1
+ c.gyp_env.GYP_CROSSCOMPILE = 1
+ c.gyp_env.GYP_GENERATORS.add('ninja')
+ c.gyp_env.GYP_GENERATOR_FLAGS['default_target'] = 'All'
+ gyp_defs = c.gyp_env.GYP_DEFINES
+ gyp_defs['fastbuild'] = 1
+ gyp_defs['OS'] = 'android'
+ gyp_defs['host_os'] = 'linux'
+ gyp_defs['gcc_version'] = 46
+ gyp_defs['order_text_section'] = ['orderfiles', 'orderfile.out']
+ gyp_defs['target_arch'] = 'arm'
+
@CONFIG_CTX(includes=['android_defaults', 'default_compiler', 'goma'])
def main_builder(c):
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/api.py ('k') | scripts/slave/recipes/android/android_builder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698