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

Commit dbfe5a7e authored by Alex Deymo's avatar Alex Deymo Committed by Android Git Automerger
Browse files

am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater." 

* commit '06ba28c3':
  Pack the update_engine_config.txt when using the A/B OTA updater.
parents 9fc7d3d6 06ba28c3

core/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -1593,8 +1593,12 @@ ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),) 
	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	    ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root)

endif

ifeq ($(AB_OTA_UPDATER),true)

	@# When using the A/B updater, include the updater config files in the zip.

	$(hide) $(ACP) $(TOPDIR)system/update_engine/update_engine.conf $(zip_root)/META/update_engine_config.txt

endif

ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true)

	# If breakpad symbols have been generated, add them to the zip.

	@# If breakpad symbols have been generated, add them to the zip.

	$(hide) $(ACP) -r $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD

endif

	@# Zip everything up, preserving symlinks