[assembly] Include blobs in assembly input bundle pkg and tgz

Include the blobs as well as the pkg manifests and other files in the
assembly input bundle's package, and the archive of that package.

Change-Id: Ibb1ef84d64a5629900779d92d45b410e53ce0e4f
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/638638
Fuchsia-Auto-Submit: Aaron Wood <[email protected]>
Reviewed-by: Christopher Crawford <[email protected]>
Reviewed-by: Aidan Wolter <[email protected]>
Commit-Queue: Auto-Submit <[email protected]>

Author: woody77

build/assembly/scripts/make_legacy_config.py

@@ -91,8 +91,9 @@ def copy_to_assembly_input_bundle(
         all_blobs[merkle] = source
 
     # Copy all the blobs to their dir in the out-of-tree layout
-    blob_deps = copy_blobs(all_blobs, outdir)
+    (all_blobs, blob_deps) = copy_blobs(all_blobs, outdir)
     deps.update(blob_deps)
+    result.blobs = set([os.path.relpath(blob_path, outdir) for blob_path in all_blobs])
 
     # Copy the bootfs entries
     (bootfs,
@@ -179,12 +180,13 @@ def copy_packages(
     return (packages, blobs, deps)
 
 
-def copy_blobs(blobs: Dict[Merkle, FilePath], outdir: FilePath) -> DepSet:
+def copy_blobs(blobs: Dict[Merkle, FilePath], outdir: FilePath) -> Tuple[List[FilePath], DepSet]:
+    blob_paths: List[FilePath] = []
     deps: DepSet = set()
 
     # Bail early if empty
     if len(blobs) == 0:
-        return deps
+        return (blob_paths, deps)
 
     # Create the directory for the blobs, now that we know it will exist.
     blobs_dir = os.path.join(outdir, "blobs")
@@ -193,10 +195,12 @@ def copy_blobs(blobs: Dict[Merkle, FilePath], outdir: FilePath) -> DepSet:
     # Copy all blobs
     for (merkle, source) in blobs.items():
         blob_destination = os.path.join(blobs_dir, merkle)
+        blob_paths.append(blob_destination)
         fast_copy(source, blob_destination)
         deps.add(source)
 
-    return deps
+    return (blob_paths, deps)
+
 
 
 def copy_file_entries(entries: FileEntrySet, outdir: FilePath,

build/python/modules/assembly/assembly_input_bundle.py

@@ -10,7 +10,7 @@
 """
 import json
 import os
-from typing import Dict, List, Set, TextIO
+from typing import Dict, List, Set, TextIO, Union
 
 from depfile.depfile import FilePath
 
@@ -86,6 +86,7 @@ class AssemblyInputBundle(ImageAssemblyConfig):
     def __init__(self) -> None:
         super().__init__()
         self.config_data: ConfigDataEntries = {}
+        self.blobs: Union[None, Set[FilePath]] = None
 
     @classmethod
     def from_dict(cls, dict: Dict) -> 'AssemblyInputBundle':
@@ -124,7 +125,7 @@ def __repr__(self) -> str:
 
     def intersection(
             self, other: 'AssemblyInputBundle') -> 'AssemblyInputBundle':
-        """Return the intersection of the two ImageAssemblyConfiguration's
+        """Return the intersection of the two 'ImageAssemblyConfiguration's
         """
         result = super().intersection(other)
         config_data: ConfigDataEntries = {}
@@ -139,7 +140,7 @@ def intersection(
         return result
 
     def difference(self, other: 'AssemblyInputBundle') -> 'AssemblyInputBundle':
-        """Return the difference of the two ImageAssemblyConfiguration's
+        """Return the difference of the two 'ImageAssemblyConfiguration's
         """
         result = super().difference(other)
         for (package, entries) in self.config_data.items():
@@ -163,6 +164,8 @@ def all_file_paths(self) -> List[FilePath]:
             file_paths.append(self.kernel.path)
         for entries in self.config_data.values():
             file_paths.extend([entry.source for entry in entries])
+        if self.blobs is not None:
+            file_paths.extend(self.blobs)
         return file_paths
 
     def write_fini_manifest(