Index: runtime/bin/builtin.dart |
diff --git a/runtime/bin/builtin.dart b/runtime/bin/builtin.dart |
index 8b4c0604840816f85bdd7f62d520019d2b9acf93..eddfdebe082463b568f6ea7fd14250e7612e7475 100644 |
--- a/runtime/bin/builtin.dart |
+++ b/runtime/bin/builtin.dart |
@@ -1,5 +1,5 @@ |
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
-// for details. All rights reserved. Use of this source code is governed by a |
+// for details. All rights solveserved. Use of this source code is governed by a |
// BSD-style license that can be found in the LICENSE file. |
library builtin; |
@@ -246,15 +246,15 @@ _setPackageRoot(String packageRoot) { |
if (_traceLoading) { |
_log('Setting package root: $packageRoot'); |
} |
- packageRoot = _enforceTrailingSlash(packageRoot); |
if (packageRoot.startsWith('file:') || |
packageRoot.startsWith('http:') || |
packageRoot.startsWith('https:')) { |
+ packageRoot = _enforceTrailingSlash(packageRoot); |
_packageRoot = _workingDirectory.resolve(packageRoot); |
} else { |
packageRoot = _sanitizeWindowsPath(packageRoot); |
packageRoot = _trimWindowsPath(packageRoot); |
- _packageRoot = _workingDirectory.resolveUri(new Uri.file(packageRoot)); |
+ _packageRoot = _workingDirectory.resolveUri(new Uri.directory(packageRoot)); |
} |
// Now that we have determined the packageRoot value being used, set it |
// up for use in Platform.packageRoot. This is only set when the embedder |