Index: pkg/dev_compiler/web/web_command.dart |
diff --git a/pkg/dev_compiler/web/web_command.dart b/pkg/dev_compiler/web/web_command.dart |
index 34626338be4da07881bb360cb3dafab1bcedfd67..1af52ce890d423180d9f3762778cbf550fcbcf25 100644 |
--- a/pkg/dev_compiler/web/web_command.dart |
+++ b/pkg/dev_compiler/web/web_command.dart |
@@ -18,7 +18,6 @@ import 'package:analyzer/file_system/file_system.dart' show ResourceUriResolver; |
import 'package:analyzer/file_system/memory_file_system.dart' |
show MemoryResourceProvider; |
import 'package:analyzer/src/context/context.dart' show AnalysisContextImpl; |
-import 'package:analyzer/src/generated/source.dart' show DartUriResolver; |
import 'package:analyzer/src/summary/idl.dart' show PackageBundle; |
import 'package:analyzer/src/summary/package_bundle_reader.dart' |
show |
@@ -27,7 +26,6 @@ import 'package:analyzer/src/summary/package_bundle_reader.dart' |
InputPackagesResultProvider, |
InSummarySource; |
import 'package:analyzer/src/dart/resolver/scope.dart' show Scope; |
-import 'package:analyzer/src/summary/summary_sdk.dart' show SummaryBasedDartSdk; |
import 'package:args/command_runner.dart'; |
@@ -95,13 +93,12 @@ class WebCompileCommand extends Command { |
CompileModule setUpCompile(List<int> sdkBytes, List<List<int>> summaryBytes, |
List<String> summaryUrls) { |
- var resourceProvider = new MemoryResourceProvider(); |
- var resourceUriResolver = new ResourceUriResolver(resourceProvider); |
+ var dartSdkSummaryPath = '/dart-sdk/lib/_internal/web_sdk.sum'; |
+ |
+ var resourceProvider = new MemoryResourceProvider() |
+ ..newFileWithBytes(dartSdkSummaryPath, sdkBytes); |
- var packageBundle = new PackageBundle.fromBuffer(sdkBytes); |
- var webDartSdk = new SummaryBasedDartSdk.fromBundle( |
- true, packageBundle, resourceProvider); |
- var sdkResolver = new DartUriResolver(webDartSdk); |
+ var resourceUriResolver = new ResourceUriResolver(resourceProvider); |
var summaryDataStore = new SummaryDataStore([]); |
for (var i = 0; i < summaryBytes.length; i++) { |
@@ -116,8 +113,9 @@ class WebCompileCommand extends Command { |
var fileResolvers = [summaryResolver, resourceUriResolver]; |
var compiler = new ModuleCompiler( |
- new AnalyzerOptions.basic(dartSdkPath: '/dart-sdk'), |
- sdkResolver: sdkResolver, |
+ new AnalyzerOptions.basic( |
+ dartSdkPath: '/dart-sdk', dartSdkSummaryPath: dartSdkSummaryPath), |
+ analysisRoot: '/web-compile-root', |
fileResolvers: fileResolvers, |
resourceProvider: resourceProvider); |