commit 8c1e526fdd4245236c8fca0c0f1857ffed9e3ca7
author Yifan Hong <elsk@google.com> Mon Jul 19 16:35:05 2021 +0000
committer Yifan Hong <elsk@google.com> Mon Jul 19 10:38:25 2021 -0700
tree ff12383f9f4f20567ef311a3c8dbb6d2b680ad44
parent c26dc73d81543da9832159a6cde2d3d26a96ee63

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

This reverts commit bf77787cc9da4c9a94797658a087222004831984.

Reason for revert: relanding change

Test: see next CL
Bug: 193925883
Bug: 193588301

Change-Id: Id397ad0975390617bd277573f2cdba9a2677842d

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index aaefacd..9e252c8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4210,16 +4210,25 @@
   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 ($(TARGET_NO_KERNEL),true)
-      build_ota_package := false
-    endif
-    ifeq ($(recovery_fstab),)
-      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.