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

Commit 8c1e526f authored by Yifan Hong's avatar Yifan Hong
Browse files

Reland "Build OTA when boot image exists even without kernel or recovery fstab" 

This reverts commit bf77787c.

Reason for revert: relanding change

Test: see next CL
Bug: 193925883
Bug: 193588301

Change-Id: Id397ad0975390617bd277573f2cdba9a2677842d
parent c26dc73d

core/Makefile

+15 −6
Original line number Diff line number Diff line
@@ -4210,16 +4210,25 @@ else 
  ifeq ($(TARGET_PRODUCT),sdk)

    build_ota_package := false

  endif

  # A target without a kernel or recovery fstab may be one of the following:

  # - A generic target. In this case, the OTA package usually isn't built.

  #   PRODUCT_BUILD_GENERIC_OTA_PACKAGE may be set to true to force OTA package

  #   generation.

  # - A real device target, with TARGET_NO_KERNEL set to true and

  #   BOARD_PREBUILT_BOOTIMAGE set. In this case, it is valid to generate

  #   an OTA package.

  ifneq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)

    ifneq ($(filter generic%,$(TARGET_DEVICE)),)

      build_ota_package := false

    endif

    ifeq ($(INSTALLED_BOOTIMAGE_TARGET),)

      ifeq ($(TARGET_NO_KERNEL),true)

        build_ota_package := false

      endif

      ifeq ($(recovery_fstab),)

        build_ota_package := false

      endif

    endif # INSTALLED_BOOTIMAGE_TARGET == ""

  endif # PRODUCT_BUILD_GENERIC_OTA_PACKAGE



  # Set build_otatools_package, and allow opt-out below.