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

Commit 90099997 authored by Cole Faust's avatar Cole Faust
Browse files

Sort AB_OTA_PARTITIONS 

Some product config makefiles are being refactored for
the conversion to Starlark. In order to test that the
refactor doesn't cause any meaningful change, we test
that the ninja files are the same before/after the refactor.
Currently, they have differences in the order of AB_OTA_PARTIONS,
which shouldn't matter. In order to increase our confidence
and make the ninja files more stable, sort AB_OTA_PARTITIONS
before it's used.

Bug: 220169197
Test: Presubmits
Change-Id: I6a9f9f2990406d810577cf8930416925f2987311
parent dda4576d

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



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