Index: runtime/bin/dartutils.cc |
diff --git a/runtime/bin/dartutils.cc b/runtime/bin/dartutils.cc |
index 5db7dacc0d58644d8b1fee7ee2762858795fe723..c0d607271f91657fe5cebc283e7facb461a8710e 100644 |
--- a/runtime/bin/dartutils.cc |
+++ b/runtime/bin/dartutils.cc |
@@ -334,18 +334,6 @@ Dart_Handle DartUtils::SetWorkingDirectory() { |
} |
-Dart_Handle DartUtils::ResolveUri(Dart_Handle library_url, Dart_Handle url) { |
- const int kNumArgs = 2; |
- Dart_Handle dart_args[kNumArgs]; |
- dart_args[0] = library_url; |
- dart_args[1] = url; |
- return Dart_Invoke(DartUtils::BuiltinLib(), |
- NewString("_resolveUri"), |
- kNumArgs, |
- dart_args); |
-} |
- |
- |
Dart_Handle DartUtils::ResolveUriInWorkingDirectory(Dart_Handle script_uri) { |
const int kNumArgs = 1; |
Dart_Handle dart_args[kNumArgs]; |
@@ -379,6 +367,29 @@ Dart_Handle DartUtils::LibraryFilePath(Dart_Handle library_uri) { |
} |
+Dart_Handle DartUtils::ResolveUri(Dart_Handle library_url, Dart_Handle url) { |
+ const int kNumArgs = 2; |
+ Dart_Handle dart_args[kNumArgs]; |
+ dart_args[0] = library_url; |
+ dart_args[1] = url; |
+ return Dart_Invoke(DartUtils::BuiltinLib(), |
+ NewString("_resolveUri"), |
+ kNumArgs, |
+ dart_args); |
+} |
+ |
+ |
+Dart_Handle DartUtils::ResolveScript(Dart_Handle url) { |
+ const int kNumArgs = 1; |
+ Dart_Handle dart_args[kNumArgs]; |
+ dart_args[0] = url; |
+ return Dart_Invoke(DartUtils::BuiltinLib(), |
+ NewString("_resolveScriptUri"), |
+ kNumArgs, |
+ dart_args); |
+} |
+ |
+ |
static Dart_Handle LoadDataAsync_Invoke(Dart_Handle tag, |
Dart_Handle url, |
Dart_Handle library_url) { |
@@ -742,7 +753,7 @@ Dart_Handle DartUtils::SetupPackageRoot(const char* package_root, |
Dart_Handle dart_args[kNumArgs]; |
dart_args[0] = result; |
result = Dart_Invoke(DartUtils::BuiltinLib(), |
- NewString("_loadPackagesMap"), |
+ NewString("_setPackagesMap"), |
kNumArgs, |
dart_args); |
RETURN_IF_ERROR(result); |