Fix javahome for pub bots

client/tools/buildbot_annotated_steps.py

 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
@@ skipping 186 matching lines @@
   if GetShouldClobber():
     print '@@@BUILD_STEP Clobber@@@'
     status = ClobberBuilder()
     if status != 0:
       print '@@@STEP_FAILURE@@@'
       return status
 
 
   #TODO(sigmund): remove this indirection once we update our bots
   (name, version) = GetBuildInfo()
+  # The buildbot will set a BUILDBOT_JAVA_HOME relative to the dart
+  # root directory, set JAVA_HOME based on that.
+  FixJavaHome()
   if name.startswith('dart-editor'):
-    # TODO (danrubel) Fix dart-editor builds so that we can call FixJavaHome() before the build
-    FixJavaHome()
     status = ProcessTools('release', name, version)
   elif name.startswith('pub-'):
     status = ProcessBot(name, 'pub')
   elif name.startswith('vm-android'):
     status = ProcessBot(name, 'android')
   else:
-    # The buildbot will set a BUILDBOT_JAVA_HOME relative to the dart
-    # root directory, set JAVA_HOME based on that.
-    FixJavaHome()
     status = ProcessBot(name, 'compiler')
 
   if status:
     print '@@@STEP_FAILURE@@@'
 
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())