Index: buildbot/osuosl/master/config/builders.py =================================================================== --- buildbot/osuosl/master/config/builders.py +++ buildbot/osuosl/master/config/builders.py @@ -754,7 +754,7 @@ 'slavenames': ["lldb-x86_64-darwin-13.4"], 'builddir': "buildDir", 'factory': LLDBBuilder.getLLDBxcodebuildFactory()}, - {'name': "lldb-x86_64-ubuntu-14.04-cross-compilation", + {'name': "lldb-x86_64-ubuntu-14.04-android", 'slavenames': ["lldb-lab-linux01"], 'builddir': "lldb-cross-compile", 'factory': LLDBBuilder.getLLDBUbuntuCMakeBuildFactory( Index: zorg/buildbot/builders/LLDBBuilder.py =================================================================== --- zorg/buildbot/builders/LLDBBuilder.py +++ zorg/buildbot/builders/LLDBBuilder.py @@ -373,7 +373,7 @@ WithProperties('%(deviceid)s'), 'shell'] hostname = 'localhost' - launchcmd = ['screen', '-d', '-m'] + shellcmd + launchcmd = ['screen', '-d', '-m'] + shellcmd + [WithProperties("TMPDIR=%(remote_dir)s/tmp")] terminatecmd = 'ps | grep lldb-server | awk \'{print $2}\' | xargs' terminatecmd = WithProperties('adb -s %(deviceid)s shell ' + terminatecmd + ' adb -s %(deviceid)s shell kill') cleandircmd = WithProperties('adb -s %(deviceid)s shell rm -rf %(remote_dir)s/*')