From 7d5b8fd88f004d616e15b4d155aa2d32bf326ae5 Mon Sep 17 00:00:00 2001 From: "ricow@google.com" Date: Thu, 17 Oct 2013 06:53:01 +0000 Subject: [PATCH] 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 --- client/tools/buildbot_annotated_steps.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/client/tools/buildbot_annotated_steps.py b/client/tools/buildbot_annotated_steps.py index 21f2e48893b..4a2d187eca4 100755 --- a/client/tools/buildbot_annotated_steps.py +++ b/client/tools/buildbot_annotated_steps.py @@ -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'])