commit fd02c7660be3fc23862d1d348f60a75cd153291f
author Dmitrii Merkurev <dimorinny@google.com> Thu Dec 14 19:22:43 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 14 19:22:43 2023 +0000
tree 213d4ccea16ff7687eeb630901767ca72cd8fd73
parent d7930f7cc065e593ccb0be45c2c62fb85e7c9687
parent 9f2bf543b95b95b3a8f0bef6dbc72bb17bf7d819

Merge "Revert "Revert "Allow to override fastboot-info.txt for specific..."" into main am: ecabf893a0 am: 9f2bf543b9

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

Change-Id: I55053bfb8aea3d40a607a6ea28b53c9785137ecf
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 7d7457e..4a1cda1 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5626,7 +5626,12 @@
 FASTBOOT_INFO_VERSION = 1
 
 INSTALLED_FASTBOOT_INFO_TARGET := $(PRODUCT_OUT)/fastboot-info.txt
-
+ifdef TARGET_BOARD_FASTBOOT_INFO_FILE
+$(INSTALLED_FASTBOOT_INFO_TARGET): $(TARGET_BOARD_FASTBOOT_INFO_FILE)
+	rm -f $@
+	$(call pretty,"Target fastboot-info.txt: $@")
+	$(hide) cp $< $@
+else
 $(INSTALLED_FASTBOOT_INFO_TARGET):
 	rm -f $@
 	$(call pretty,"Target fastboot-info.txt: $@")
@@ -5685,6 +5690,7 @@
 ifeq ($(BOARD_USES_METADATA_PARTITION),true)
 	$(hide) echo "if-wipe erase metadata" >> $@
 endif
+endif
 
 # -----------------------------------------------------------------
 #  misc_info.txt