commit e902b9d1bbbc9ec08e0a9b7cbe28818e2bf6a4f6
author Spandan Das <spandandas@google.com> Mon Mar 10 16:59:38 2025 +0000
committer Spandan Das <spandandas@google.com> Mon Mar 10 20:42:56 2025 +0000
tree 90a704669fcb428db587ab2130c0e3243eb1603a
parent d66d5db0003619e5f0545daa249c3cb7513f263f

Sort strip dynamic_partition_list

`dump-dynamic-partitions-info` is used to generate misc_info.txt and
dynamic_partitions_info.txt. Currently there are diffs when generating
this file using Make and Soong packaging systems due to formatting and
ordering differences. This CL removes those diffs by using sort.

Bug: 399788100
Test: The following diffs are removed between make and soong
< dynamic_partition_list=    product system system_ext system_dlkm odm vendor vendor_dlkm odm_dlkm
> dynamic_partition_list=odm odm_dlkm product system system_dlkm system_ext vendor vendor_dlkm

< super_google_system_dynamic_partitions_partition_list=    product system system_ext system_dlkm
> super_google_system_dynamic_partitions_partition_list=product system system_ext system_dlkm

< super_google_vendor_dynamic_partitions_partition_list=    odm vendor vendor_dlkm odm_dlkm
> super_google_vendor_dynamic_partitions_partition_list=odm vendor vendor_dlkm odm_dlkm

Change-Id: I2239946c5dbff24a2c0fc2758933167090b83c6c

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 651b1e0..2051c2c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -6279,13 +6279,13 @@
   $(foreach device,$(BOARD_SUPER_PARTITION_BLOCK_DEVICES), \
     echo "super_$(device)_device_size=$(BOARD_SUPER_PARTITION_$(call to-upper,$(device))_DEVICE_SIZE)" >> $(1);)
   $(if $(BOARD_SUPER_PARTITION_PARTITION_LIST), \
-    echo "dynamic_partition_list=$(call filter-out-missing-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))" >> $(1))
+    echo "dynamic_partition_list=$(sort $(call filter-out-missing-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST)))" >> $(1))
   $(if $(BOARD_SUPER_PARTITION_GROUPS),
     echo "super_partition_groups=$(BOARD_SUPER_PARTITION_GROUPS)" >> $(1))
   $(foreach group,$(BOARD_SUPER_PARTITION_GROUPS), \
     echo "super_$(group)_group_size=$(BOARD_$(call to-upper,$(group))_SIZE)" >> $(1); \
     $(if $(BOARD_$(call to-upper,$(group))_PARTITION_LIST), \
-      echo "super_$(group)_partition_list=$(call filter-out-missing-partitions,$(BOARD_$(call to-upper,$(group))_PARTITION_LIST))" >> $(1);))
+      echo "super_$(group)_partition_list=$(strip $(call filter-out-missing-partitions,$(BOARD_$(call to-upper,$(group))_PARTITION_LIST)))" >> $(1);))
   $(if $(filter true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED)), \
     echo "build_non_sparse_super_partition=true" >> $(1))
   $(if $(filter true,$(TARGET_USERIMAGES_SPARSE_F2FS_DISABLED)), \