| Index: client/tools/buildbot_annotated_steps.py
|
| ===================================================================
|
| --- client/tools/buildbot_annotated_steps.py (revision 16022)
|
| +++ client/tools/buildbot_annotated_steps.py (working copy)
|
| @@ -204,18 +204,16 @@
|
|
|
| #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:
|
|
|