summaryrefslogtreecommitdiffstats
path: root/build/android
diff options
context:
space:
mode:
authorsivachandra@chromium.org <sivachandra@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-23 23:16:13 +0000
committersivachandra@chromium.org <sivachandra@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-23 23:16:13 +0000
commit13e2f04da83dc9fa5ef42d28e113168b2a4b4d9a (patch)
treeb9c38f63309a72bf186452feb92cdb103d7ec850 /build/android
parent6462f8111b3626878c14f641f769b24607eaf868 (diff)
downloadchromium_src-13e2f04da83dc9fa5ef42d28e113168b2a4b4d9a.zip
chromium_src-13e2f04da83dc9fa5ef42d28e113168b2a4b4d9a.tar.gz
chromium_src-13e2f04da83dc9fa5ef42d28e113168b2a4b4d9a.tar.bz2
[Android Buildbot] Add option to set extra env vars before envsetup.
Review URL: https://chromiumcodereview.appspot.com/22824037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
-rwxr-xr-xbuild/android/buildbot/bb_run_bot.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py
index 23db7ec..9e2efbe 100755
--- a/build/android/buildbot/bb_run_bot.py
+++ b/build/android/buildbot/bb_run_bot.py
@@ -45,10 +45,12 @@ def DictDiff(d1, d2):
return '\n'.join(diff)
-def GetEnvironment(host_obj, testing):
+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'
if host_obj.target_arch:
envsetup_cmd += ' --target-arch=%s' % host_obj.target_arch