From 901136e9d82bf05673e11d04a813d7abceeab974 Mon Sep 17 00:00:00 2001 From: Dmitrii Merkurev Date: Thu, 14 Dec 2023 02:59:47 +0000 Subject: [PATCH] Revert "Revert "Allow to override fastboot-info.txt for specific..." Revert submission 2871792-revert-2871156-fastboot_info-UVHXWCTZZB Reason for revert: Some images weren't available in Android.mk Reverted changes: /q/submissionid:2871792-revert-2871156-fastboot_info-UVHXWCTZZB Bug: 315866782 Test: confirmed bluejay abtd build has correct fastboot-info.txt Change-Id: Id75d879119744ab97225e5a551e8d32a1b09a356 Signed-off-by: Dmitrii Merkurev --- core/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 7d7457e7af..4a1cda13e3 100644 --- a/core/Makefile +++ b/core/Makefile @@ -5626,7 +5626,12 @@ endif # build_otatools_package 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 @@ endif ifeq ($(BOARD_USES_METADATA_PARTITION),true) $(hide) echo "if-wipe erase metadata" >> $@ endif +endif # ----------------------------------------------------------------- # misc_info.txt