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

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

Merge "Sort AB_OTA_PARTITIONS" am: 94daa8bf am: 35630ea7 am: ec4ce2fc 

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

Change-Id: Ibbb383a2842c4fbdc56d30be678fb849f013868f
parents 30f2cbbf ec4ce2fc

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5563,7 +5563,7 @@ ifeq ($(AB_OTA_UPDATER),true) 
	$(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) cp $(HOST_OUT_SHARED_LIBRARIES)/liblz4.so $(zip_root)/META/liblz4.so

	$(hide) for part in $(strip $(AB_OTA_PARTITIONS)); do \

	$(hide) for part in $(sort $(AB_OTA_PARTITIONS)); do \

	  echo "$${part}" >> $(zip_root)/META/ab_partitions.txt; \

	done

	$(hide) for conf in $(strip $(AB_OTA_POSTINSTALL_CONFIG)); do \

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ endif 
ADDITIONAL_PRODUCT_PROPERTIES += ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)



ifeq ($(AB_OTA_UPDATER),true)

ADDITIONAL_PRODUCT_PROPERTIES += ro.product.ab_ota_partitions=$(subst $(space),$(comma),$(strip $(AB_OTA_PARTITIONS)))

ADDITIONAL_PRODUCT_PROPERTIES += ro.product.ab_ota_partitions=$(subst $(space),$(comma),$(sort $(AB_OTA_PARTITIONS)))

endif



# -----------------------------------------------------------------