Chromium Code Reviews| Index: runtime/bin/builtin.dart |
| diff --git a/runtime/bin/builtin.dart b/runtime/bin/builtin.dart |
| index 7088bed33c1189d04296dd9b70cccc7b18326ba9..dc374f609a8769e7dd61b39ef6180a333d6f8c42 100644 |
| --- a/runtime/bin/builtin.dart |
| +++ b/runtime/bin/builtin.dart |
| @@ -234,6 +234,9 @@ _setPackageRoot(String packageRoot) { |
| packageRoot = _trimWindowsPath(packageRoot); |
| _packageRoot = _workingDirectory.resolveUri(new Uri.file(packageRoot)); |
|
Lasse Reichstein Nielsen
2015/12/17 07:03:33
Maybe use "new Uri.directory" instead. It ensures
Ivan Posva
2015/12/17 15:44:35
The slash has already been added with _enforceTrai
|
| } |
| + // Now that we have determined the packageRoot value being used, set it |
| + // up for use in Platform.packageRoot. |
| + VMLibraryHooks.packageRoot = _packageRoot.toString(); |
| if (_traceLoading) { |
| _log('Package root URI: $_packageRoot'); |
| } |
| @@ -482,6 +485,7 @@ void _loadPackagesMap(String packagesParam) { |
| // resolve it against the working directory. |
| packagesUri = _workingDirectory.resolveUri(packagesUri); |
| } |
| + VMLibraryHooks.packageConfig = packagesUri.toString(); |
| if (_traceLoading) { |
| _log('Resolved packages map to: $packagesUri'); |
| } |