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

Merge "Embed zucchini version info in target_files" am: a9bc0e1db5 am: 68a38e8e95 am: d3e90e46cf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1906834

Change-Id: Ieb15661ec64a344087c7672becea09db3356e822
This commit is contained in:
Treehugger Robot
2021-12-01 00:29:28 +00:00
committed by Automerger Merge Worker
parent b19192bfc0 d3e90e46cf
commit 12f91e39f2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -4735,6 +4735,7 @@ $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_TOOL_EXTENSION := $(tool_extension)
ifeq ($(AB_OTA_UPDATER),true) ifeq ($(AB_OTA_UPDATER),true)
updater_dep := system/update_engine/update_engine.conf updater_dep := system/update_engine/update_engine.conf
updater_dep := external/zucchini/version_info.h
endif endif
# Build OTA tools if non-A/B is allowed # Build OTA tools if non-A/B is allowed
@@ -5208,6 +5209,7 @@ endif
ifeq ($(AB_OTA_UPDATER),true) ifeq ($(AB_OTA_UPDATER),true)
@# When using the A/B updater, include the updater config files in the zip. @# When using the A/B updater, include the updater config files in the zip.
$(hide) cp $(TOPDIR)system/update_engine/update_engine.conf $(zip_root)/META/update_engine_config.txt $(hide) cp $(TOPDIR)system/update_engine/update_engine.conf $(zip_root)/META/update_engine_config.txt
$(hide) cp $(TOPDIR)external/zucchini/version_info.h $(zip_root)/META/zucchini_config.txt
$(hide) for part in $(strip $(AB_OTA_PARTITIONS)); do \ $(hide) for part in $(strip $(AB_OTA_PARTITIONS)); do \
echo "$${part}" >> $(zip_root)/META/ab_partitions.txt; \ echo "$${part}" >> $(zip_root)/META/ab_partitions.txt; \
done done