Index: editor/util/plugins/com.google.dart.java2dart/resources/java_io.dart |
diff --git a/editor/util/plugins/com.google.dart.java2dart/resources/java_io.dart b/editor/util/plugins/com.google.dart.java2dart/resources/java_io.dart |
index 40e6f2d81bbc3f58821fec8e9189dd755f99a753..53c25466be328dd454b752c549e3195208a1f858 100644 |
--- a/editor/util/plugins/com.google.dart.java2dart/resources/java_io.dart |
+++ b/editor/util/plugins/com.google.dart.java2dart/resources/java_io.dart |
@@ -24,7 +24,17 @@ class JavaSystemIO { |
if (name == 'com.google.dart.sdk') { |
String exec = new Options().executable; |
if (exec.length != 0) { |
- String sdkPath = new Path(exec).directoryPath.directoryPath.toString(); |
+ String sdkPath; |
+ // may be "xcodebuild/ReleaseIA32/dart" with "dart-sdk" sibling |
+ { |
+ sdkPath = new Path(exec).directoryPath.append("dart-sdk").toNativePath(); |
+ if (new Directory(sdkPath).existsSync()) { |
+ _properties[name] = sdkPath; |
+ return sdkPath; |
+ } |
+ } |
+ // probably be "dart-sdk/bin/dart" |
+ sdkPath = new Path(exec).directoryPath.directoryPath.toString(); |
_properties[name] = sdkPath; |
return sdkPath; |
} |