Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36b230c3 authored by Bill Peckham's avatar Bill Peckham Committed by android-build-merger
Browse files

Merge "Skip some build steps if not building system image." am: 4a3c68bf 

am: 8a4041a1

Change-Id: I17249226965c48c599da4a6f932e4d63b0c7a5d0
parents 89527442 8a4041a1

tools/releasetools/add_img_to_target_files.py

+5 −3
Original line number Diff line number Diff line
@@ -734,6 +734,7 @@ def AddImagesToTargetFiles(filename): 
                          os.path.exists(os.path.join(OPTIONS.input_tmp,

                                                      "IMAGES",

                                                      "product_services.img")))

  has_system = os.path.isdir(os.path.join(OPTIONS.input_tmp, "SYSTEM"))

  has_system_other = os.path.isdir(os.path.join(OPTIONS.input_tmp,

                                                "SYSTEM_OTHER"))
@@ -798,6 +799,7 @@ def AddImagesToTargetFiles(filename): 
        if output_zip:

          recovery_two_step_image.AddToZip(output_zip)



  if has_system:

    banner("system")

    partitions['system'] = AddSystem(

        output_zip, recovery_img=recovery_image, boot_img=boot_image)