Change SdkBundle to better fit its usage by SummaryResynthesizer.

pkg/analyzer/tool/summary/build_sdk_summary.dart

 import 'dart:io';
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/summary/builder.dart';
 import 'package:analyzer/src/summary/format.dart';
@@ skipping 28 matching lines @@
     sdkPath = DirectoryBasedDartSdk.defaultSdkDirectory.getAbsolutePath();
   }
   //
   // Prepare SDK.
   //
   DirectoryBasedDartSdk sdk = new DirectoryBasedDartSdk(new JavaFile(sdkPath));
   AnalysisContext context = sdk.context;
   //
   // Serialize each SDK library.
   //
+  List<String> prelinkedLibraryUris = <String>[];
+  List<PrelinkedLibraryBuilder> prelinkedLibraries =
+      <PrelinkedLibraryBuilder>[];
+  List<String> unlinkedUnitUris = <String>[];
+  List<UnlinkedUnitBuilder> unlinkedUnits = <UnlinkedUnitBuilder>[];
   BuilderContext builderContext = new BuilderContext();
-  List<SdkBundleLibraryBuilder> libraryBuilders = <SdkBundleLibraryBuilder>[];
   for (SdkLibrary lib in sdk.sdkLibraries) {
     print('Resolving and serializing: ${lib.shortName}');
     Source librarySource = sdk.mapDartUri(lib.shortName);
     LibraryElement libraryElement =
         context.computeLibraryElement(librarySource);
     LibrarySerializationResult libraryResult =
         serializeLibrary(builderContext, libraryElement, context.typeProvider);
-    SdkBundleLibraryBuilder libraryBuilder = encodeSdkBundleLibrary(
-        builderContext,
-        uri: lib.shortName,
-        prelinked: libraryResult.prelinked,
-        unlinkedUnits: libraryResult.unlinkedUnits);
-    libraryBuilders.add(libraryBuilder);
+    prelinkedLibraryUris.add(lib.shortName);
+    prelinkedLibraries.add(libraryResult.prelinked);
+    unlinkedUnitUris.addAll(libraryResult.unitUris);
+    unlinkedUnits.addAll(libraryResult.unlinkedUnits);
   }
   //
   // Write the whole SDK bundle.
   //
-  SdkBundleBuilder sdkBundle =
-      encodeSdkBundle(builderContext, libraries: libraryBuilders);
+  SdkBundleBuilder sdkBundle = encodeSdkBundle(builderContext,
+      prelinkedLibraryUris: prelinkedLibraryUris,
+      prelinkedLibraries: prelinkedLibraries,
+      unlinkedUnitUris: unlinkedUnitUris,
+      unlinkedUnits: unlinkedUnits);
   File file = new File(outputFilePath);
   file.writeAsBytesSync(sdkBundle.toBuffer(), mode: FileMode.WRITE_ONLY);
 }
 
 /**
  * The name of the SDK summary builder application.
  */
 const BINARY_NAME = "build_sdk_summary";
 
 /**
  * Print information about how to use the SDK summary builder.
  */
 void _printUsage() {
   print('Usage: $BINARY_NAME output_file_path [sdk_path]');
 }