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

Commit f3029f52 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Revert "Build OTA when boot image exists even without kernel or... 

Merge "Revert "Build OTA when boot image exists even without kernel or recovery fstab"" am: fa26e5b8 am: f4494732 am: 8ac71d89 am: 0df6e715

Original change: https://android-review.googlesource.com/c/platform/build/+/1771586

Change-Id: I33525ec801d68bc55c0c029c1181a739f8660489
parents 421172ec 0df6e715

core/Makefile

+6 −15
Original line number Diff line number Diff line
@@ -4235,25 +4235,16 @@ 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.