commit f32f65c5a441b536c36c7361a42742841d6b61e6
author Yifan Hong <elsk@google.com> Wed Jul 14 14:19:12 2021 -0700
committer Yifan Hong <elsk@google.com> Mon Jul 19 10:38:25 2021 -0700
tree 86afe4a41d3f9c8b178487376664ecf4b337b152
parent 8c1e526fdd4245236c8fca0c0f1857ffed9e3ca7

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9e252c8..f57d25e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4210,7 +4210,7 @@
   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 @@
       ifeq ($(TARGET_NO_KERNEL),true)
         build_ota_package := false
       endif
-      ifeq ($(recovery_fstab),)
-        build_ota_package := false
-      endif
     endif # INSTALLED_BOOTIMAGE_TARGET == ""
+    ifeq ($(recovery_fstab),)
+      build_ota_package := false
+    endif
   endif # PRODUCT_BUILD_GENERIC_OTA_PACKAGE
 
   # Set build_otatools_package, and allow opt-out below.