scripts/slave/recipe_modules/chromium_android/chromium_config.py - Issue 23431038: [chromium_android recipes] Cleanup envsetup step and cleanup step names.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: rebase 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

« scripts/slave/recipe_modules/chromium_android/api.py ('K') | « scripts/slave/recipe_modules/chromium_android/api.py ('k') | scripts/slave/recipes/android/android_builder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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):