Record information about a summary's dependencies in the summary itself.

pkg/analyzer_cli/lib/src/build_mode.dart

 // Copyright (c) 2015, 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 analyzer_cli.src.build_mode;
 
 import 'dart:core' hide Resource;
 import 'dart:io' as io;
 
 import 'package:analyzer/dart/ast/ast.dart' show CompilationUnit;
@@ skipping 120 matching lines @@
   final AnalysisStats stats;
 
   SummaryDataStore summaryDataStore;
   InternalAnalysisContext context;
   Map<Uri, JavaFile> uriToFileMap;
   final List<Source> explicitSources = <Source>[];
 
   PackageBundleAssembler assembler;
   final Set<Source> processedSources = new Set<Source>();
   final Map<Uri, UnlinkedUnit> uriToUnit = <Uri, UnlinkedUnit>{};
+  PackageBundle sdkBundle;
 
   BuildMode(this.resourceProvider, this.options, this.stats);
 
+  bool get _shouldOutputSummary =>
+      options.buildSummaryOutput != null ||
+      options.buildSummaryOutputSemantic != null;
+
   /**
    * Perform package analysis according to the given [options].
    */
   ErrorSeverity analyze() {
     // Write initial progress message.
     if (!options.machineFormat) {
       outSink.writeln("Analyzing sources ${options.sourceFiles}...");
     }
 
     // Create the URI to file map.
@@ skipping 28 matching lines @@
         if (!analysisResult.hasMoreWork) {
           break;
         }
       }
     }
 
     // Write summary.
     assembler = new PackageBundleAssembler(
         excludeHashes: options.buildSummaryExcludeInformative &&
             options.buildSummaryOutputSemantic == null);
-    if (options.buildSummaryOutput != null ||
-        options.buildSummaryOutputSemantic != null) {
+    if (_shouldOutputSummary) {
       if (options.buildSummaryOnlyAst && !options.buildSummaryFallback) {
         _serializeAstBasedSummary(explicitSources);
       } else {
         for (Source source in explicitSources) {
           if (context.computeKindOf(source) == SourceKind.LIBRARY) {
             if (options.buildSummaryFallback) {
               assembler.addFallbackLibrary(source);
             } else {
               LibraryElement libraryElement =
                   context.computeLibraryElement(source);
               assembler.serializeLibraryElement(libraryElement);
             }
           }
           if (options.buildSummaryFallback) {
             assembler.addFallbackUnit(source);
           }
         }
       }
+      if (!options.buildSummaryOnlyAst) {
+        // In non-AST mode, the SDK bundle wasn't added to the summaryDataStore
+        // because it is automatically loaded during analysis.  However we still
+        // want the SDK bundle to be noted as a dependency, so add it now.
+        summaryDataStore.addBundle(null, sdkBundle);
+      }
       // Write the whole package bundle.
-      PackageBundleBuilder sdkBundle = assembler.assemble();
+      assembler.recordDependencies(summaryDataStore);
+      PackageBundleBuilder bundle = assembler.assemble();
       if (options.buildSummaryExcludeInformative) {
-        sdkBundle.flushInformative();
+        bundle.flushInformative();
       }
       if (options.buildSummaryOutput != null) {
         io.File file = new io.File(options.buildSummaryOutput);
-        file.writeAsBytesSync(sdkBundle.toBuffer(),
-            mode: io.FileMode.WRITE_ONLY);
+        file.writeAsBytesSync(bundle.toBuffer(), mode: io.FileMode.WRITE_ONLY);
       }
       if (options.buildSummaryOutputSemantic != null) {
-        sdkBundle.flushInformative();
+        bundle.flushInformative();
         io.File file = new io.File(options.buildSummaryOutputSemantic);
-        file.writeAsBytesSync(sdkBundle.toBuffer(),
-            mode: io.FileMode.WRITE_ONLY);
+        file.writeAsBytesSync(bundle.toBuffer(), mode: io.FileMode.WRITE_ONLY);
       }
     }
 
     if (options.buildSummaryOnly) {
       return ErrorSeverity.NONE;
     } else {
       // Process errors.
       _printErrors(outputPath: options.buildAnalysisOutput);
       return _computeMaxSeverity();
     }
@@ skipping 11 matching lines @@
             maxSeverity = maxSeverity.max(processedSeverity.severity);
           }
         }
       }
     }
     return maxSeverity;
   }
 
   void _createContext() {
     // Read the summaries.
-    summaryDataStore = new SummaryDataStore(options.buildSummaryInputs);
+    summaryDataStore = new SummaryDataStore(options.buildSummaryInputs,
+        recordDependencyInfo: _shouldOutputSummary);
 
     DartSdk sdk;
-    PackageBundle sdkBundle;
     if (options.dartSdkSummaryPath != null) {
       SummaryBasedDartSdk summarySdk = new SummaryBasedDartSdk(
           options.dartSdkSummaryPath, options.strongMode);
       sdk = summarySdk;
       sdkBundle = summarySdk.bundle;
     } else {
       DirectoryBasedDartSdk directorySdk =
           new DirectoryBasedDartSdk(new JavaFile(options.dartSdkPath));
       directorySdk.analysisOptions =
           Driver.createAnalysisOptionsForCommandLineOptions(options);
@@ skipping 115 matching lines @@
             'Illegal input file (must be "\$uri|\$path"): $sourceFile');
         return null;
       }
       Uri uri = Uri.parse(sourceFile.substring(0, pipeIndex));
       String path = sourceFile.substring(pipeIndex + 1);
       uriToFileMap[uri] = new JavaFile(path);
     }
     return uriToFileMap;
   }
 }