Support multiple resolution inputs from command line.

pkg/compiler/lib/src/options.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.src.options;
 
 import 'commandline_options.dart' show Flags;
 import '../compiler.dart' show PackagesDiscoveryProvider;
 
 /// Options used for parsing.
@@ skipping 169 matching lines @@
 
   /// URI of the main output if the compiler is generating source maps.
   final Uri outputUri;
 
   /// Location of the platform configuration file.
   final Uri platformConfigUri;
 
   /// Whether to emit URIs in the reflection metadata.
   final bool preserveUris;
 
-  /// The location of serialized data used for resolution.
-  final Uri resolutionInput;
+  /// The locations of serialized data used for resolution.
+  final List<Uri> resolutionInputs;
 
   /// The location of the serialized data from resolution.
   final Uri resolutionOutput;
 
   // If `true`, sources are resolved and serialized.
   final bool resolveOnly;
 
   /// URI where the compiler should generate the output source map file.
   final Uri sourceMapUri;
 
@@ skipping 47 matching lines @@
 
   /// Strip option used by dart2dart.
   final List<String> strips;
 
   /// Create an options object by parsing flags from [options].
   factory CompilerOptions.parse(
       {Uri entryPoint,
       Uri libraryRoot,
       Uri packageRoot,
       Uri packageConfig,
-      Uri resolutionInput,
+      List<Uri> resolutionInputs,
       Uri resolutionOutput,
       PackagesDiscoveryProvider packagesDiscoveryProvider,
       Map<String, dynamic> environment: const <String, dynamic>{},
       List<String> options}) {
     return new CompilerOptions(
         entryPoint: entryPoint,
         libraryRoot: libraryRoot,
         packageRoot: packageRoot,
         packageConfig: packageConfig,
         packagesDiscoveryProvider: packagesDiscoveryProvider,
@@ skipping 32 matching lines @@
         generateCodeWithCompileTimeErrors:
             _hasOption(options, Flags.generateCodeWithCompileTimeErrors),
         generateSourceMap: !_hasOption(options, Flags.noSourceMaps),
         hasIncrementalSupport: _forceIncrementalSupport ||
             _hasOption(options, Flags.incrementalSupport),
         outputUri: _extractUriOption(options, '--out='),
         platformConfigUri:
             _resolvePlatformConfigFromOptions(libraryRoot, options),
         preserveComments: _hasOption(options, Flags.preserveComments),
         preserveUris: _hasOption(options, Flags.preserveUris),
-        resolutionInput: resolutionInput,
+        resolutionInputs: resolutionInputs,
         resolutionOutput: resolutionOutput,
         resolveOnly: _hasOption(options, Flags.resolveOnly),
         sourceMapUri: _extractUriOption(options, '--source-map='),
         strips: _extractCsvOption(options, '--force-strip='),
         testMode: _hasOption(options, Flags.testMode),
         trustJSInteropTypeAnnotations:
             _hasOption(options, Flags.trustJSInteropTypeAnnotations),
         trustPrimitives: _hasOption(options, Flags.trustPrimitives),
         trustTypeAnnotations: _hasOption(options, Flags.trustTypeAnnotations),
         useContentSecurityPolicy:
@@ skipping 43 matching lines @@
       bool enableNativeLiveTypeAnalysis: true,
       bool enableTypeAssertions: false,
       bool enableUserAssertions: false,
       bool generateCodeWithCompileTimeErrors: false,
       bool generateSourceMap: true,
       bool hasIncrementalSupport: false,
       Uri outputUri: null,
       Uri platformConfigUri: null,
       bool preserveComments: false,
       bool preserveUris: false,
-      Uri resolutionInput: null,
+      List<Uri> resolutionInputs: null,
       Uri resolutionOutput: null,
       bool resolveOnly: false,
       Uri sourceMapUri: null,
       List<String> strips: const [],
       bool testMode: false,
       bool trustJSInteropTypeAnnotations: false,
       bool trustPrimitives: false,
       bool trustTypeAnnotations: false,
       bool useContentSecurityPolicy: false,
       bool useCpsIr: false,
@@ skipping 54 matching lines @@
         enableUserAssertions: enableUserAssertions,
         generateCodeWithCompileTimeErrors: generateCodeWithCompileTimeErrors,
         generateSourceMap: generateSourceMap,
         hasIncrementalSupport: hasIncrementalSupport,
         outputUri: outputUri,
         platformConfigUri: platformConfigUri ??
             _resolvePlatformConfig(
                 libraryRoot, null, !emitJavaScript, const []),
         preserveComments: preserveComments,
         preserveUris: preserveUris,
-        resolutionInput: resolutionInput,
+        resolutionInputs: resolutionInputs,
         resolutionOutput: resolutionOutput,
         resolveOnly: resolveOnly,
         sourceMapUri: sourceMapUri,
         strips: strips,
         testMode: testMode,
         trustJSInteropTypeAnnotations: trustJSInteropTypeAnnotations,
         trustPrimitives: trustPrimitives,
         trustTypeAnnotations: trustTypeAnnotations,
         useContentSecurityPolicy: useContentSecurityPolicy,
         useCpsIr: useCpsIr,
@@ skipping 30 matching lines @@
       this.enableNativeLiveTypeAnalysis: false,
       this.enableTypeAssertions: false,
       this.enableUserAssertions: false,
       this.generateCodeWithCompileTimeErrors: false,
       this.generateSourceMap: true,
       this.hasIncrementalSupport: false,
       this.outputUri: null,
       this.platformConfigUri: null,
       this.preserveComments: false,
       this.preserveUris: false,
-      this.resolutionInput: null,
+      this.resolutionInputs: null,
       this.resolutionOutput: null,
       this.resolveOnly: false,
       this.sourceMapUri: null,
       this.strips: const [],
       this.testMode: false,
       this.trustJSInteropTypeAnnotations: false,
       this.trustPrimitives: false,
       this.trustTypeAnnotations: false,
       this.useContentSecurityPolicy: false,
       this.useCpsIr: false,
@@ skipping 101 matching lines @@
 
 /// Locations of the platform descriptor files relative to the library root.
 const String _clientPlatform = "lib/dart_client.platform";
 const String _serverPlatform = "lib/dart_server.platform";
 const String _sharedPlatform = "lib/dart_shared.platform";
 const String _dart2dartPlatform = "lib/dart2dart.platform";
 
 const String _UNDETERMINED_BUILD_ID = "build number could not be determined";
 const bool _forceIncrementalSupport =
     const bool.fromEnvironment('DART2JS_EXPERIMENTAL_INCREMENTAL_SUPPORT');