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 10a6df11a062e51df32c7c6d1e1e1ef83dc839d1..49eac5c81aa66f54d1b93f1ee0c8853dd499ff99 100755 |
--- a/build/android/buildbot/bb_run_bot.py |
+++ b/build/android/buildbot/bb_run_bot.py |
@@ -70,6 +70,11 @@ def GetEnvironment(host_obj, testing, extra_env_vars=None): |
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: |