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

Commit 2a386e0c authored by Ying Wang's avatar Ying Wang
Browse files

Allow to build the update.zip for emulator build. 

img_from_target_files.py just skips the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
parent f39752e9

core/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -1306,6 +1306,11 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) 
.PHONY: otapackage

otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)



endif    # recovery_fstab is defined

endif    # TARGET_NO_KERNEL != true

endif    # TARGET_DEVICE != generic*

endif    # TARGET_PRODUCT != sdk



# -----------------------------------------------------------------

# The update package
@@ -1334,10 +1339,6 @@ $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) 
.PHONY: updatepackage

updatepackage: $(INTERNAL_UPDATE_PACKAGE_TARGET)



endif    # recovery_fstab is defined

endif    # TARGET_NO_KERNEL != true

endif    # TARGET_DEVICE != generic*

endif    # TARGET_PRODUCT != sdk



ifdef is_tests_build

# -----------------------------------------------------------------

tools/releasetools/common.py

+2 −0
Original line number Diff line number Diff line
@@ -482,6 +482,8 @@ def CheckSize(data, target, info_dict): 
  if target.endswith(".img"): target = target[:-4]

  mount_point = "/" + target



  fs_type = None

  limit = None

  if info_dict["fstab"]:

    if mount_point == "/userdata": mount_point = "/data"

    p = info_dict["fstab"][mount_point]

tools/releasetools/img_from_target_files

+8 −5
Original line number Diff line number Diff line
@@ -239,11 +239,14 @@ def main(argv): 


  output_zip = zipfile.ZipFile(args[1], "w", compression=zipfile.ZIP_DEFLATED)



  common.GetBootableImage(

      "boot.img", "boot.img", OPTIONS.input_tmp, "BOOT").AddToZip(output_zip)

  common.GetBootableImage(

      "recovery.img", "recovery.img", OPTIONS.input_tmp,

      "RECOVERY").AddToZip(output_zip)

  boot_image = common.GetBootableImage(

      "boot.img", "boot.img", OPTIONS.input_tmp, "BOOT")

  if boot_image:

    boot_image.AddToZip(output_zip)

  recovery_image = common.GetBootableImage(

      "recovery.img", "recovery.img", OPTIONS.input_tmp, "RECOVERY")

  if recovery_image:

    recovery_image.AddToZip(output_zip)



  if not bootable_only:

    AddSystem(output_zip)