build/android/buildbot/bb_run_bot.py - Issue 170273005: android envsetup: Stop setting GYP_DEFINES.

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 170273005: android envsetup: Stop setting GYP_DEFINES. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 9 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:

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 0d3d2755cb37f4efc6554a17ad671c62af0c227b..aee7f0fb8a3c4f4f5ce455ebdbd56f407c919430 100755

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

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

@@ -68,7 +68,7 @@ def GetEnvironment(host_obj, testing, extra_env_vars=None):

sys.exit(1)

env = json.loads(json_env)

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

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

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

if host_obj.target_arch:

env['GYP_DEFINES'] += ' target_arch=%s' % host_obj.target_arch

extra_gyp = host_obj.extra_gyp_defines

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