Index: pkg/analyzer_cli/lib/src/driver.dart |
diff --git a/pkg/analyzer_cli/lib/src/driver.dart b/pkg/analyzer_cli/lib/src/driver.dart |
index 8302c75eb91654dfaf29d88cbee0f651e18ee00e..3821bf04723f095883233d5c2209d8f1b6533c2c 100644 |
--- a/pkg/analyzer_cli/lib/src/driver.dart |
+++ b/pkg/analyzer_cli/lib/src/driver.dart |
@@ -388,16 +388,15 @@ class Driver implements CommandLineStarter { |
// 'dart:' URIs come first. |
// Setup embedding. |
- EmbedderUriResolver embedderUriResolver = |
- new EmbedderUriResolver(embedderMap); |
- if (embedderUriResolver.length == 0) { |
+ EmbedderSdk embedderSdk = new EmbedderSdk(embedderMap); |
+ if (embedderSdk.libraryMap.size() == 0) { |
// The embedder uri resolver has no mappings. Use the default Dart SDK |
// uri resolver. |
resolvers.add(new DartUriResolver(sdk)); |
} else { |
// The embedder uri resolver has mappings, use it instead of the default |
// Dart SDK uri resolver. |
- resolvers.add(embedderUriResolver); |
+ resolvers.add(new DartUriResolver(embedderSdk)); |
} |
// Next SdkExts. |