commit 0d3917068f740567771f51cfd420ad41247ff192
author Ben Fennema <fennema@google.com> Fri Apr 26 17:17:21 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 26 17:17:21 2024 +0000
tree 4c287dcb15be5f57b4e8913112d1f450e69478d0
parent 68dcf07bc7d15fbb82322825c353b2b33ac13e64
parent 5e6df98fc38fe42d66f0815dd7655ba5d5285e7e

Merge "Allow setting --boot_variable_file in build-ota-package-target" into main am: 5e6df98fc3

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

Change-Id: If0ce27e09076510c76edd6f6d9e745be35478971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index e6a5bc0..e563873 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -6919,6 +6919,7 @@
         --verbose \
         --path $(HOST_OUT) \
         $(if $(OEM_OTA_CONFIG), --oem_settings $(OEM_OTA_CONFIG)) \
+        $(if $(BOOT_VAR_OTA_CONFIG), --boot_variable_file $(BOOT_VAR_OTA_CONFIG)) \
         $(2) \
         $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE)) $(1)
 endef