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

Commit 6332b2ca authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Revert^2 "Determine build_ota_package based on recovery.fstab install location" 

This change resubmits https://r.android.com/3461419.

recovery_fstab can be installed even if is not defined via
TARGET_RECOVERY_FSTAB_GENRULE. This change modifies the conditional in
determining build_ota_package to take such scenarios into account.

Test: m otapackage
Change-Id: Id4cdd1b0d9953535cee9096047e432bcf8a0fa10
parent d23ab721

core/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -5651,8 +5651,10 @@ else 
      endif

    endif # INSTALLED_BOOTIMAGE_TARGET == ""

    ifeq ($(recovery_fstab),)

      ifeq ($(filter $(TARGET_RECOVERY_ROOT_OUT)/system/etc/recovery.fstab,$(INTERNAL_RECOVERYIMAGE_FILES)),)

        build_ota_package := false

      endif

    endif

  endif # PRODUCT_BUILD_GENERIC_OTA_PACKAGE



  # Set build_otatools_package, and allow opt-out below.