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

Support for recovery snapshot.

Browse Source 
Bug: 171231437
Test: source build/envsetup.sh
Test: ALLOW_MISSING_DEPENDENCIES=true m -j nothing
Change-Id: I6dbcf21ee26c53cd3ac573d118a99d68161aa2c7
This commit is contained in:
Jose Galmes
2020-12-21 08:31:10 -08:00
parent fb991de5fe
commit 5cd2547df9
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/soong_config.mk
View File

@@ -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_str, ProductVndkVersion, $(PRODUCT_PRODUCT_VNDK_VERSION))
$(call add_json_list, ExtraVndkVersions, $(PRODUCT_EXTRA_VNDK_VERSIONS)) $(call add_json_list, ExtraVndkVersions, $(PRODUCT_EXTRA_VNDK_VERSIONS))
$(call add_json_list, DeviceSystemSdkVersions, $(BOARD_SYSTEMSDK_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_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_not_svelte, $(call invert_bool,$(filter true,$(MALLOC_SVELTE))))
$(call add_json_bool, Malloc_zero_contents, $(call invert_bool,$(filter false,$(MALLOC_ZERO_CONTENTS)))) $(call add_json_bool, Malloc_zero_contents, $(call invert_bool,$(filter false,$(MALLOC_ZERO_CONTENTS))))

10
core/tasks/recovery_snapshot.mk
View File

@@ -14,21 +14,21 @@
current_makefile := $(lastword $(MAKEFILE_LIST)) current_makefile := $(lastword $(MAKEFILE_LIST))
# BOARD_VNDK_VERSION must be set to 'current' in order to generate a recovery snapshot. # RECOVERY_SNAPSHOT_VERSION must be set to 'current' in order to generate a recovery snapshot.
ifeq ($(BOARD_VNDK_VERSION),current) ifeq ($(RECOVERY_SNAPSHOT_VERSION),current)
.PHONY: recovery-snapshot .PHONY: recovery-snapshot
recovery-snapshot: $(SOONG_RECOVERY_SNAPSHOT_ZIP) recovery-snapshot: $(SOONG_RECOVERY_SNAPSHOT_ZIP)
$(call dist-for-goals, 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 .PHONY: recovery-snapshot
recovery-snapshot: PRIVATE_MAKEFILE := $(current_makefile) recovery-snapshot: PRIVATE_MAKEFILE := $(current_makefile)
recovery-snapshot: recovery-snapshot:
$(call echo-error,$(PRIVATE_MAKEFILE),\ $(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 exit 1
endif # BOARD_VNDK_VERSION endif # RECOVERY_SNAPSHOT_VERSION