From 05ce97d613a5418707cbe186262dfa157d7f7e5a Mon Sep 17 00:00:00 2001
From: Jan Altensen <info@stricted.net>
Date: Fri, 10 Sep 2021 08:37:05 +0200
Subject: [PATCH] g12: fix flashing of DTB/logo images

 * the build system apparently does not like it when `add-radio-file` is called from within build rules when building via `m target-files-package`, manually add it to the radioimage list

Change-Id: I250a5a36305fadb3c36b5d61f3fc68b03bb5ede7
---
 build/tasks/2ndbootloader.mk | 7 ++++---
 logo/Android.mk              | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/tasks/2ndbootloader.mk b/build/tasks/2ndbootloader.mk
index 26433eb..030d307 100644
--- a/build/tasks/2ndbootloader.mk
+++ b/build/tasks/2ndbootloader.mk
@@ -46,9 +46,6 @@ else
 	$(hide) rm -rf $(DTBTMP)
 endif
 	$(hide) $(call aml-compress-dtb, $(DTBTARGET))
-ifeq ($(TARGET_FLASH_DTB_PARTITION),true)
-	$(hide) $(call add-radio-file,$(DTBTARGET))
-endif
 	$(hide) $(ACP) $(DTBTARGET) $@
 
 $(BOARD_PREBUILT_DTBOIMAGE): $(INSTALLED_KERNEL_TARGET) $(MKDTBOIMG)
@@ -56,6 +53,10 @@ $(BOARD_PREBUILT_DTBOIMAGE): $(INSTALLED_KERNEL_TARGET) $(MKDTBOIMG)
 		$(DTBDIR)/$(strip $(dtbo)).dtb \
 	)
 
+ifeq ($(TARGET_FLASH_DTB_PARTITION),true)
+INSTALLED_RADIOIMAGE_TARGET += $(DTBTARGET)
+endif
+
 .PHONY: dtbotest
 dtbotest: $(BOARD_PREBUILT_DTBOIMAGE)
 
diff --git a/logo/Android.mk b/logo/Android.mk
index 9887ba5..f2ebdce 100644
--- a/logo/Android.mk
+++ b/logo/Android.mk
@@ -23,10 +23,11 @@ $(INSTALLED_LOGOIMAGE_TARGET): $(LOCAL_INSTALLED_MODULE) | $(IMGPACK) $(MINIGZIP
 		fi;)
 	$(hide) $(IMGPACK) -r $(PRODUCT_OUT)/logo $(INSTALLED_LOGOIMAGE_TARGET)
 	$(hide) rm -rf $(PRODUCT_OUT)/logo
-	$(call add-radio-file,$(INSTALLED_LOGOIMAGE_TARGET))
 
 ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_LOGOIMAGE_TARGET)
 ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_LOGOIMAGE_TARGET)
 
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_LOGOIMAGE_TARGET)
+
 .PHONY: logoimage
 logoimage: $(INSTALLED_LOGOIMAGE_TARGET)
-- 
2.20.1