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

Commit dfb457c8 authored by Stephen Boyd's avatar Stephen Boyd Committed by Gerrit Code Review
Browse files

Merge "core/Makefile: Make PACK_DESKTOP_{RECOVERY,UPDATE}_IMAGE into product variable" into main

parents 490590b7 5b55f926

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -7976,7 +7976,7 @@ endif # PACK_DESKTOP_FILESYSTEM_IMAGES 


# -----------------------------------------------------------------

# Desktop pack recovery image hook.

ifneq (,$(strip $(PACK_DESKTOP_RECOVERY_IMAGE)))

ifeq ($(BOARD_USES_DESKTOP_RECOVERY_IMAGE),true)

PACK_RECOVERY_IMAGE_TARGET := $(PRODUCT_OUT)/android-desktop_recovery_image.bin

PACK_RECOVERY_IMAGE_ARGS := --noarchive --recovery
@@ -7997,11 +7997,11 @@ $(call dist-for-goals,dist_files,$(PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET)) 
.PHONY: pack-recovery-image

pack-recovery-image: $(PACK_RECOVERY_IMAGE_TARGET)



endif # PACK_DESKTOP_RECOVERY_IMAGE

endif # BOARD_USES_DESKTOP_RECOVERY_IMAGE



# -----------------------------------------------------------------

# Desktop pack update image hook.

ifneq (,$(strip $(PACK_DESKTOP_UPDATE_IMAGE)))

ifeq ($(BOARD_USES_DESKTOP_UPDATE_IMAGE),true)

PACK_UPDATE_IMAGE_TARGET := $(PRODUCT_OUT)/android-desktop_update_image.bin

PACK_UPDATE_IMAGE_ARGS := --noarchive --update
@@ -8022,7 +8022,7 @@ $(call dist-for-goals,dist_files,$(PACKED_UPDATE_IMAGE_ARCHIVE_TARGET)) 
.PHONY: pack-update-image

pack-update-image: $(PACK_UPDATE_IMAGE_TARGET)



endif # PACK_DESKTOP_UPDATE_IMAGE

endif # BOARD_USES_DESKTOP_UPDATE_IMAGE



PACK_MIGRATION_IMAGE_SCRIPT := $(HOST_OUT_EXECUTABLES)/pack_migration_image

core/board_config.mk

+12 −0
Original line number Diff line number Diff line
@@ -924,6 +924,18 @@ ifeq ($(PRODUCT_BUILD_PVMFW_IMAGE),true) 
endif

.KATI_READONLY := BOARD_USES_PVMFWIMAGE



BOARD_USES_DESKTOP_RECOVERY_IMAGE :=

ifeq ($(PRODUCT_BUILD_DESKTOP_RECOVERY_IMAGE),true)

  BOARD_USES_DESKTOP_RECOVERY_IMAGE := true

endif

.KATI_READONLY := BOARD_USES_DESKTOP_RECOVERY_IMAGE



BOARD_USES_DESKTOP_UPDATE_IMAGE :=

ifeq ($(PRODUCT_BUILD_DESKTOP_UPDATE_IMAGE),true)

  BOARD_USES_DESKTOP_UPDATE_IMAGE := true

endif

.KATI_READONLY := BOARD_USES_DESKTOP_UPDATE_IMAGE



###########################################

# Ensure consistency among TARGET_RECOVERY_UPDATER_LIBS, AB_OTA_UPDATER, and PRODUCT_OTA_FORCE_NON_AB_PACKAGE.

TARGET_RECOVERY_UPDATER_LIBS ?=

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -366,6 +366,8 @@ _product_single_value_vars += PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE 
_product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE

_product_single_value_vars += PRODUCT_BUILD_SUPER_EMPTY_IMAGE

_product_single_value_vars += PRODUCT_BUILD_PVMFW_IMAGE

_product_single_value_vars += PRODUCT_BUILD_DESKTOP_RECOVERY_IMAGE

_product_single_value_vars += PRODUCT_BUILD_DESKTOP_UPDATE_IMAGE



# List of boot jars delivered via updatable APEXes, following the same format as

# PRODUCT_BOOT_JARS.