| 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 e0c1eea5b4ccbaff496edf1e2ba42620f426046b..b51a67eff59d80a88e7fe15ed84dab71243fe5c0 100644
|
| --- a/pkg/analyzer_cli/lib/src/driver.dart
|
| +++ b/pkg/analyzer_cli/lib/src/driver.dart
|
| @@ -25,7 +25,6 @@ import 'package:analyzer/src/generated/engine.dart';
|
| import 'package:analyzer/src/generated/error.dart';
|
| import 'package:analyzer/src/generated/interner.dart';
|
| import 'package:analyzer/src/generated/java_engine.dart';
|
| -import 'package:analyzer/src/generated/java_io.dart';
|
| import 'package:analyzer/src/generated/sdk.dart';
|
| import 'package:analyzer/src/generated/source.dart';
|
| import 'package:analyzer/src/generated/source_io.dart';
|
| @@ -366,8 +365,10 @@ class Driver implements CommandLineStarter {
|
| UriResolver packageUriResolver;
|
|
|
| if (options.packageRootPath != null) {
|
| - JavaFile packageDirectory = new JavaFile(options.packageRootPath);
|
| - packageUriResolver = new PackageUriResolver([packageDirectory]);
|
| + ContextBuilder builder = new ContextBuilder(resourceProvider, null, null);
|
| + builder.defaultPackagesDirectoryPath = options.packageRootPath;
|
| + packageUriResolver = new PackageMapUriResolver(resourceProvider,
|
| + builder.convertPackagesToMap(builder.createPackageMap('')));
|
| } else if (options.packageConfigPath == null) {
|
| // TODO(pq): remove?
|
| if (packageInfo.packageMap == null) {
|
|
|