build/android/buildbot/bb_run_bot.py - Issue 142393002: android: Use use_goma=1 gomadir gyp defines instead of magic GOMA_DIR env var.

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: build/android/buildbot/bb_run_bot.py

Issue 142393002: android: Use use_goma=1 gomadir gyp defines instead of magic GOMA_DIR env var. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nowat Created 6 years, 11 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: build/android/buildbot/bb_run_bot.py

diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py

index 158bea9579a93ad4d71410d5419fb9bff3b8853f..50e70ee758598f2ee2100f573a1bbf3fd1b7de3a 100755

--- a/build/android/buildbot/bb_run_bot.py

+++ b/build/android/buildbot/bb_run_bot.py

@@ -48,7 +48,6 @@ def DictDiff(d1, d2):

def GetEnvironment(host_obj, testing, extra_env_vars=None):

init_env = dict(os.environ)

init_env['GYP_GENERATORS'] = 'ninja'

- init_env['GOMA_DIR'] = bb_utils.GOMA_DIR

if extra_env_vars:

init_env.update(extra_env_vars)

envsetup_cmd = '. build/android/envsetup.sh'

@@ -70,7 +69,8 @@ def GetEnvironment(host_obj, testing, extra_env_vars=None):

print >> sys.stderr, envsetup_output

sys.exit(1)

env = json.loads(json_env)

- env['GYP_DEFINES'] = env.get('GYP_DEFINES', '') + ' fastbuild=1'

+ env['GYP_DEFINES'] = env.get('GYP_DEFINES', '') + \

+ ' fastbuild=1 use_goma=1 gomadir=%s' % bb_utils.GOMA_DIR

extra_gyp = host_obj.extra_gyp_defines

if extra_gyp:

env['GYP_DEFINES'] += ' %s' % extra_gyp

« no previous file with comments | « no previous file | build/android/envsetup.sh » ('j') | no next file with comments »