From 16490d3207698530f435614b3dd3a2ea6d14ab0c Mon Sep 17 00:00:00 2001
From: Dan Shi <dshi@google.com>
Date: Wed, 13 Dec 2023 18:58:49 +0000
Subject: [PATCH] Revert "Allow to override fastboot-info.txt for specific
 board"

Revert submission 2871156-fastboot_info

Reason for revert: possble cause of b/315866782

Reverted changes: /q/submissionid:2871156-fastboot_info

Change-Id: I07baf20bd50529a36f2841350a24ba58d480f5e2
---
 core/Makefile           | 65 +++++++++++++++++++++++++++++++++++++
 target/board/Android.mk | 71 -----------------------------------------
 2 files changed, 65 insertions(+), 71 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 403c4cf011..845f7c8202 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5615,6 +5615,71 @@ $(call dist-for-goals, otatools-package, \
 
 endif # build_otatools_package
 
+# -----------------------------------------------------------------
+#  fastboot-info.txt
+FASTBOOT_INFO_VERSION = 1
+
+INSTALLED_FASTBOOT_INFO_TARGET := $(PRODUCT_OUT)/fastboot-info.txt
+
+$(INSTALLED_FASTBOOT_INFO_TARGET):
+	rm -f $@
+	$(call pretty,"Target fastboot-info.txt: $@")
+	$(hide) echo "# fastboot-info for $(TARGET_PRODUCT)" >> $@
+	$(hide) echo "version $(FASTBOOT_INFO_VERSION)" >> $@
+ifneq ($(INSTALLED_BOOTIMAGE_TARGET),)
+	$(hide) echo "flash boot" >> $@
+endif
+ifneq ($(INSTALLED_INIT_BOOT_IMAGE_TARGET),)
+	$(hide) echo "flash init_boot" >> $@
+endif
+ifdef BOARD_PREBUILT_DTBOIMAGE
+	$(hide) echo "flash dtbo" >> $@
+endif
+ifneq ($(INSTALLED_DTIMAGE_TARGET),)
+	$(hide) echo "flash dts dt.img" >> $@
+endif
+ifneq ($(INSTALLED_VENDOR_KERNEL_BOOTIMAGE_TARGET),)
+	$(hide) echo "flash vendor_kernel_boot" >> $@
+endif
+ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
+	$(hide) echo "flash recovery" >> $@
+endif
+ifeq ($(BOARD_USES_PVMFWIMAGE),true)
+	$(hide) echo "flash pvmfw" >> $@
+endif
+ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)
+	$(hide) echo "flash vendor_boot" >> $@
+endif
+ifeq ($(BOARD_AVB_ENABLE),true)
+ifeq ($(BUILDING_VBMETA_IMAGE),true)
+	$(hide) echo "flash --apply-vbmeta vbmeta" >> $@
+endif
+ifneq (,$(strip $(BOARD_AVB_VBMETA_SYSTEM)))
+	$(hide) echo "flash vbmeta_system" >> $@
+endif
+ifneq (,$(strip $(BOARD_AVB_VBMETA_VENDOR)))
+	$(hide) echo "flash vbmeta_vendor" >> $@
+endif
+ifneq (,$(strip $(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)))
+	$(hide) $(foreach partition,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS), \
+	  echo "flash vbmeta_$(partition)" >> $@;)
+endif
+endif # BOARD_AVB_ENABLE
+	$(hide) echo "reboot fastboot" >> $@
+	$(hide) echo "update-super" >> $@
+	$(hide) $(foreach partition,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \
+	  echo "flash $(partition)" >> $@;)
+ifdef BUILDING_SYSTEM_OTHER_IMAGE
+	$(hide) echo "flash --slot-other system system_other.img" >> $@
+endif
+ifdef BUILDING_CACHE_IMAGE
+	$(hide) echo "if-wipe erase cache" >> $@
+endif
+	$(hide) echo "if-wipe erase userdata" >> $@
+ifeq ($(BOARD_USES_METADATA_PARTITION),true)
+	$(hide) echo "if-wipe erase metadata" >> $@
+endif
+
 # -----------------------------------------------------------------
 #  misc_info.txt
 
diff --git a/target/board/Android.mk b/target/board/Android.mk
index c2ddb548d9..decc345ded 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -49,77 +49,6 @@ endif
 
 $(call declare-0p-target,$(INSTALLED_ANDROID_INFO_TXT_TARGET))
 
-#  fastboot-info.txt
-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: $@")
-
-	$(hide) echo "# fastboot-info for $(TARGET_PRODUCT)" >> $@
-	$(hide) echo "version $(FASTBOOT_INFO_VERSION)" >> $@
-ifneq ($(INSTALLED_BOOTIMAGE_TARGET),)
-	$(hide) echo "flash boot" >> $@
-endif
-ifneq ($(INSTALLED_INIT_BOOT_IMAGE_TARGET),)
-	$(hide) echo "flash init_boot" >> $@
-endif
-ifdef BOARD_PREBUILT_DTBOIMAGE
-	$(hide) echo "flash dtbo" >> $@
-endif
-ifneq ($(INSTALLED_DTIMAGE_TARGET),)
-	$(hide) echo "flash dts dt.img" >> $@
-endif
-ifneq ($(INSTALLED_VENDOR_KERNEL_BOOTIMAGE_TARGET),)
-	$(hide) echo "flash vendor_kernel_boot" >> $@
-endif
-ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
-	$(hide) echo "flash recovery" >> $@
-endif
-ifeq ($(BOARD_USES_PVMFWIMAGE),true)
-	$(hide) echo "flash pvmfw" >> $@
-endif
-ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)
-	$(hide) echo "flash vendor_boot" >> $@
-endif
-ifeq ($(BOARD_AVB_ENABLE),true)
-ifeq ($(BUILDING_VBMETA_IMAGE),true)
-	$(hide) echo "flash --apply-vbmeta vbmeta" >> $@
-endif
-ifneq (,$(strip $(BOARD_AVB_VBMETA_SYSTEM)))
-	$(hide) echo "flash vbmeta_system" >> $@
-endif
-ifneq (,$(strip $(BOARD_AVB_VBMETA_VENDOR)))
-	$(hide) echo "flash vbmeta_vendor" >> $@
-endif
-ifneq (,$(strip $(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)))
-	$(hide) $(foreach partition,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS), \
-	  echo "flash vbmeta_$(partition)" >> $@;)
-endif
-endif # BOARD_AVB_ENABLE
-	$(hide) echo "reboot fastboot" >> $@
-	$(hide) echo "update-super" >> $@
-	$(hide) $(foreach partition,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \
-	  echo "flash $(partition)" >> $@;)
-ifdef BUILDING_SYSTEM_OTHER_IMAGE
-	$(hide) echo "flash --slot-other system system_other.img" >> $@
-endif
-ifdef BUILDING_CACHE_IMAGE
-	$(hide) echo "if-wipe erase cache" >> $@
-endif
-	$(hide) echo "if-wipe erase userdata" >> $@
-ifeq ($(BOARD_USES_METADATA_PARTITION),true)
-	$(hide) echo "if-wipe erase metadata" >> $@
-endif
-endif
-
 # Copy compatibility metadata to the device.
 
 # Device Manifest