From c158e421ec5c6f0cbf80f12073d5a4fa7e93ad0f Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Tue, 12 May 2020 20:36:31 +0200 Subject: [PATCH] Remove empty new-space in dynamic_partition_list and super_$(group)_partition_list * As a side product .strip() calls in releasetools are redunant, but since these scripts are also used out of tree we can't remove them to guarantee compatibility Test: m dist Change-Id: I5c513a4654e293c3d4eab98c8759ea094015fab1 --- core/Makefile | 4 ++-- core/config.mk | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 11d2796a1..1ba176a11 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4051,13 +4051,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-vendor, $(BOARD_SUPER_PARTITION_PARTITION_LIST))" >> $(1)) + echo "dynamic_partition_list=$(call filter-out-missing-vendor,$(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-vendor, $(BOARD_$(call to-upper,$(group))_PARTITION_LIST))" >> $(1);)) + echo "super_$(group)_partition_list=$(call filter-out-missing-vendor,$(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)), \ diff --git a/core/config.mk b/core/config.mk index bb182aa5e..a5b8ef7cc 100644 --- a/core/config.mk +++ b/core/config.mk @@ -978,8 +978,7 @@ $(error BOARD_SUPER_PARTITION_PARTITION_LIST should not be defined, but computed BOARD_SUPER_PARTITION_GROUPS and BOARD_*_PARTITION_LIST) endif BOARD_SUPER_PARTITION_PARTITION_LIST := \ - $(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \ - $(BOARD_$(group)_PARTITION_LIST)) + $(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)),$(BOARD_$(group)_PARTITION_LIST)) .KATI_READONLY := BOARD_SUPER_PARTITION_PARTITION_LIST ifneq ($(BOARD_SUPER_PARTITION_SIZE),)