commit 649bff58eac0df38ff0a5d97f82bb1228001d789
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 20 18:50:54 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 20 18:50:54 2025 -0700
tree 31e6c63db4dbe18bfc4041b639f3ad8b16766ae9
parent b042be4c65eb8e10e8513b6f70ca2e4676009df0
parent db5f730f9d3c515dbb193fbf84b4ad1ffc6e7792

Merge "Sort avb_custom_vbmeta_images_partition_list in misc_info.txt" into main

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index f80ee8a..9e6893c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -6048,7 +6048,7 @@
 	$(hide) echo "avb_vbmeta_vendor_rollback_index_location=$(BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION)" >> $@
 endif # BOARD_AVB_VBMETA_VENDOR_KEY_PATH
 ifneq (,$(strip $(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)))
-	$(hide) echo "avb_custom_vbmeta_images_partition_list=$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)" >> $@
+	$(hide) echo "avb_custom_vbmeta_images_partition_list=$(sort $(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS))" >> $@
 	$(hide) $(foreach partition,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS),\
 	echo "avb_vbmeta_$(partition)=$(BOARD_AVB_VBMETA_$(call to-upper,$(partition)))" >> $@ ;\
 	echo "avb_vbmeta_$(partition)_args=$(BOARD_AVB_MAKE_VBMETA_$(call to-upper,$(partition))_IMAGE_ARGS)" >> $@ ;\