scripts/slave/recipes/android/android_builder.expected/x86_builder.json - Issue 134193014: Make recipes use the new way of enabling goma.

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/recipes/android/android_builder.expected/x86_builder.json

Issue 134193014: Make recipes use the new way of enabling goma. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/

Patch Set: Created 6 years, 10 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/config.py ('K') | « scripts/slave/recipes/android/android_builder.expected/try_builder.json ('k') | scripts/slave/recipes/android/android_builder.expected/x86_try_builder.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/android/android_builder.expected/x86_builder.json

===================================================================

--- scripts/slave/recipes/android/android_builder.expected/x86_builder.json (revision 248765)

+++ scripts/slave/recipes/android/android_builder.expected/x86_builder.json (working copy)

@@ -138,7 +138,7 @@

"env": {

"EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD]/src/repo/build/get_internal_landmines.py",

"GYP_CROSSCOMPILE": "1",

- "GYP_DEFINES": "OS=android app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 component=static_library fastbuild=1 host_os=linux target_arch=ia32",

+ "GYP_DEFINES": "OS=android app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux target_arch=ia32 use_goma=1",

"GYP_GENERATORS": "ninja",

"PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s"

@@ -158,6 +158,8 @@

"ninja",

"--compiler",

"goma",

+ "--goma-dir",

+ "[BUILD]/goma",

"--"

"env": {