StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit bf77787cc9.

Reason for revert: relanding change

Test: see next CL
Bug: 193925883
Bug: 193588301

Change-Id: Id397ad0975390617bd277573f2cdba9a2677842d
This commit is contained in:
Yifan Hong
2021-07-19 16:35:05 +00:00
parent c26dc73d81
commit 8c1e526fdd
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/Makefile
View File

@@ -4210,16 +4210,25 @@ else
ifeq ($(TARGET_PRODUCT),sdk) ifeq ($(TARGET_PRODUCT),sdk)
build_ota_package := false build_ota_package := false
endif 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 ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)
ifneq ($(filter generic%,$(TARGET_DEVICE)),) ifneq ($(filter generic%,$(TARGET_DEVICE)),)
build_ota_package := false build_ota_package := false
endif endif
ifeq ($(INSTALLED_BOOTIMAGE_TARGET),)
ifeq ($(TARGET_NO_KERNEL),true) ifeq ($(TARGET_NO_KERNEL),true)
build_ota_package := false build_ota_package := false
endif endif
ifeq ($(recovery_fstab),) ifeq ($(recovery_fstab),)
build_ota_package := false build_ota_package := false
endif endif
endif # INSTALLED_BOOTIMAGE_TARGET == ""
endif # PRODUCT_BUILD_GENERIC_OTA_PACKAGE endif # PRODUCT_BUILD_GENERIC_OTA_PACKAGE
# Set build_otatools_package, and allow opt-out below. # Set build_otatools_package, and allow opt-out below.