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

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

Only build OTA package for non-A/B with recovery 

Change Id397ad097539 alone would break hikey build, which
is a non-A/B device with a boot image, but without recovery.

Do not build OTA in this case.

Test: lunch hikey && m dist
Fixes: 194018054
Bug: 193588301
Change-Id: I8d09ad5c62d44699eb910ff62d32044bd97e8e44
parent 8c1e526f

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -4210,7 +4210,7 @@ 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 target without a kernel 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.
@@ -4225,10 +4225,10 @@ else 
      ifeq ($(TARGET_NO_KERNEL),true)

        build_ota_package := false

      endif

    endif # INSTALLED_BOOTIMAGE_TARGET == ""

    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.