[Android Buildbot] Add option to set extra env vars before envsetup.

build/android/buildbot/bb_run_bot.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import copy
 import json
 import os
@@ skipping 27 matching lines @@
 def DictDiff(d1, d2):
   diff = []
   for key in sorted(set(d1.keys() + d2.keys())):
     if key in d1 and d1[key] != d2.get(key):
       diff.append('- %s=%s' % (key, pipes.quote(d1[key])))
     if key in d2 and d2[key] != d1.get(key):
       diff.append('+ %s=%s' % (key, pipes.quote(d2[key])))
   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
   if testing:
     # Skip envsetup to avoid presubmit dependence on android deps.
     print 'Testing mode - skipping "%s"' % envsetup_cmd
     envsetup_cmd = ':'
   else:
     print 'Running %s' % envsetup_cmd
   proc = subprocess.Popen(['bash', '-exc',
@@ skipping 209 matching lines @@
   for command in commands:
     print 'Will run: ', bb_utils.CommandToString(command)
   print
 
   env = GetEnvironment(bot_config.host_obj, options.testing)
   return RunBotCommands(options, commands, env)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))