Revert revisions 28764, 28756, 28754, 28751

R=ager@google.com

Review URL: https://codereview.chromium.org//27668002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@28785 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
ricow@google.com 2013-10-17 06:53:01 +00:00
parent 3f8885c6ee
commit 7d5b8fd88f

View file

@ -15,7 +15,6 @@ chromium and headless dartium.
import imp
import os
import platform
import re
import socket
import subprocess
@ -135,10 +134,7 @@ def FixJavaHome():
buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME')
if buildbot_javahome:
current_pwd = os.getenv('PWD')
if platform.system() != 'Windows':
java_home = '/usr/lib/jvm/java-6-sun' # Hackety-hack. Please remove!
else:
java_home = os.path.join(current_pwd, buildbot_javahome)
java_home = os.path.join(current_pwd, buildbot_javahome)
java_bin = os.path.join(java_home, 'bin')
os.environ['JAVA_HOME'] = java_home
os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH'])