am 48ab56c5: am dbfe5a7e: am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
* commit '48ab56c5cda3d35f885ae50ac2d20567c28ab203':
Pack the update_engine_config.txt when using the A/B OTA updater.
diff --git a/core/Makefile b/core/Makefile
index 1752d31..ff7c0fe 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1593,8 +1593,12 @@
$(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