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

Commit bee0c588 authored by Jose "Pepe" Galmes's avatar Jose "Pepe" Galmes Committed by Gerrit Code Review
Browse files

Merge "Support for recovery snapshot."

parents 2d76d2df 5cd2547d

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ $(call add_json_str, Platform_vndk_version, $(PLATFORM_VNDK_VERSION 
$(call add_json_str,  ProductVndkVersion,                $(PRODUCT_PRODUCT_VNDK_VERSION))

$(call add_json_list, ExtraVndkVersions,                 $(PRODUCT_EXTRA_VNDK_VERSIONS))

$(call add_json_list, DeviceSystemSdkVersions,           $(BOARD_SYSTEMSDK_VERSIONS))

$(call add_json_str,  RecoverySnapshotVersion,           $(RECOVERY_SNAPSHOT_VERSION))

$(call add_json_list, Platform_systemsdk_versions,       $(PLATFORM_SYSTEMSDK_VERSIONS))

$(call add_json_bool, Malloc_not_svelte,                 $(call invert_bool,$(filter true,$(MALLOC_SVELTE))))

$(call add_json_bool, Malloc_zero_contents,              $(call invert_bool,$(filter false,$(MALLOC_ZERO_CONTENTS))))

core/tasks/recovery_snapshot.mk

+5 −5
Original line number Diff line number Diff line
@@ -14,21 +14,21 @@ 


current_makefile := $(lastword $(MAKEFILE_LIST))



# BOARD_VNDK_VERSION must be set to 'current' in order to generate a recovery snapshot.

ifeq ($(BOARD_VNDK_VERSION),current)

# RECOVERY_SNAPSHOT_VERSION must be set to 'current' in order to generate a recovery snapshot.

ifeq ($(RECOVERY_SNAPSHOT_VERSION),current)



.PHONY: recovery-snapshot

recovery-snapshot: $(SOONG_RECOVERY_SNAPSHOT_ZIP)



$(call dist-for-goals, recovery-snapshot, $(SOONG_RECOVERY_SNAPSHOT_ZIP))



else # BOARD_VNDK_VERSION is NOT set to 'current'

else # RECOVERY_SNAPSHOT_VERSION is NOT set to 'current'



.PHONY: recovery-snapshot

recovery-snapshot: PRIVATE_MAKEFILE := $(current_makefile)

recovery-snapshot:

	$(call echo-error,$(PRIVATE_MAKEFILE),\

		"CANNOT generate Recovery snapshot. BOARD_VNDK_VERSION must be set to 'current'.")

		"CANNOT generate Recovery snapshot. RECOVERY_SNAPSHOT_VERSION must be set to 'current'.")

	exit 1



endif # BOARD_VNDK_VERSION
 
endif # RECOVERY_SNAPSHOT_VERSION