img_from_target_files: Skip oem.img in fastboot image creation

We don't need this package to be included in fastboot images, so skip
it when we are creating fastboot images.

Change-Id: I1e0676f5cbf7468088e6997f83ae845578864668
Ticket: CYNGNOS-936

diff --git a/tools/releasetools/img_from_target_files.py b/tools/releasetools/img_from_target_files.py
index 832be7c..8b8a009 100755 (executable)
--- a/tools/releasetools/img_from_target_files.py
+++ b/tools/releasetools/img_from_target_files.py
@@ -105,6 +105,7 @@ def main(argv):
     if os.path.exists(images_path):
       # If this is a new target-files, it already contains the images,
       # and all we have to do is copy them to the output zip.
+      # Skip oem.img files since they are not needed in fastboot images.
       images = os.listdir(images_path)
       if images:
         for image in images:
@@ -112,6 +113,8 @@ def main(argv):
             continue
           if not image.endswith(".img"):
             continue
+          if i == "oem.img":
+            continue
           common.ZipWrite(
               output_zip, os.path.join(images_path, image), image)
         done = True
@@ -152,12 +155,6 @@ def main(argv):
         add_img_to_target_files.AddUserdataExtra(output_zip, prefix="")
         banner("AddCache")
         add_img_to_target_files.AddCache(output_zip, prefix="")
-        try:
-          input_zip.getinfo("OEM/")
-          banner("AddOem")
-          add_img_to_target_files.AddOem(output_zip, prefix="")
-        except KeyError:
-          pass   # no oem partition for this device
 
   finally:
     print "cleaning up..."