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

Commit ff2e24d6 authored by Yifan Hong's avatar Yifan Hong
Browse files

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

On devices with a prebuilt boot image, TARGET_NO_KERNEL
may be set to enable signing, etc. In this case we still
want to build the OTA package.

Test: m otapackage on a device with generic boot image
      (where TARGET_NO_KERNEL is set)
Bug: 193588301
Change-Id: I4e5adc3f42a516ac0e2f66c313dbe34a469ebe05
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.