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

Commit e8387e67 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Sort strip dynamic_partition_list" into main am: 76aa47b6 am: 0037f890 

Original change: https://android-review.googlesource.com/c/platform/build/+/3531435



Change-Id: I11702e1ae111d71af990759657179fcd08b3354f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1747eb74 0037f890

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -6279,13 +6279,13 @@ define dump-dynamic-partitions-info 
  $(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)), \