android: run zip/extract/compile steps in the parent of src/, like on other platforms.

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 52 matching lines @@
   proc = subprocess.Popen(['bash', '-exc',
     envsetup_cmd + ' >&2; python build/android/buildbot/env_to_json.py'],
     stdout=subprocess.PIPE, stderr=subprocess.PIPE,
     cwd=bb_utils.CHROME_SRC, env=init_env)
   json_env, envsetup_output = proc.communicate()
   if proc.returncode != 0:
     print >> sys.stderr, 'FATAL Failure in envsetup.'
     print >> sys.stderr, envsetup_output
     sys.exit(1)
   env = json.loads(json_env)
+
+  # PWD is wrong due to the cwd= parameter passed to subprocess.Popen(). Make
+  # sure the modified PWD doesn't leak into future build steps.
+  env['PWD'] = init_env['PWD']
+
   env['GYP_DEFINES'] = env.get('GYP_DEFINES', '') + ' fastbuild=1'
   extra_gyp = host_obj.extra_gyp_defines
   if extra_gyp:
     env['GYP_DEFINES'] += ' %s' % extra_gyp
     if re.search('(asan|clang)=1', extra_gyp):
       env.pop('CXX_target', None)
 
   # Bots checkout chrome in /b/build/slave/<name>/build/src
   build_internal_android = os.path.abspath(os.path.join(
       bb_utils.CHROME_SRC, '..', '..', '..', '..', '..', 'build_internal',
@@ skipping 171 matching lines @@
 
 def RunBotCommands(options, commands, env):
   print 'Environment changes:'
   print DictDiff(dict(os.environ), env)
 
   for command in commands:
     print bb_utils.CommandToString(command)
     sys.stdout.flush()
     if options.testing:
       env['BUILDBOT_TESTING'] = '1'
     return_code = subprocess.call(command, cwd=bb_utils.CHROME_SRC, env=env)

[Isaac (away), 2013/10/21 20:08:32]

We use env here and the cwd is CHROME_SRC.

[Nico, 2013/10/21 20:12:10]

Since this sets an explicit cwd it'll clobber whatever PWD is in env anyhow.

     if return_code != 0:
       return return_code
 
 
 def main(argv):
   parser = GetRunBotOptParser()
   options, args = parser.parse_args(argv[1:])
   if args:
     parser.error('Unused args: %s' % args)
 
   bot_config = GetBotConfig(options, GetBotStepMap())
   if not bot_config:
     sys.exit(1)
 
   print 'Using config:', bot_config
 
   commands = GetCommands(options, bot_config)
   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))