Merge "Skip some build steps if not building system image."

2019-02-13 22:57:35 +00:00
parent b8ac90803c cc57de3256
commit 4a3c68bffa
1 changed files with 5 additions and 3 deletions
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -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)