From 3a299dcc322a21802e555da9a4ab51d00ced6ee0 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sun, 31 May 2020 20:16:42 -0400
Subject: [PATCH] relink: use relinked files as required modules

Change-Id: I18bffa454ad64d70c5efedbf174887571e95b734
---
 prebuilt/Android.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index fcd78a3f..22252624 100755
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -502,8 +502,11 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
 LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
 LOCAL_POST_INSTALL_CMD += $(RELINK) $(TARGET_RECOVERY_ROOT_OUT)/sbin $(RELINK_SOURCE_FILES) && \
-    mv $(TOYBOX_LINKS) $(TARGET_RECOVERY_ROOT_OUT)/sbin/
-LOCAL_REQUIRED_MODULES := linker adbd libdl_android toybox libtar
+    cp $(TOYBOX_LINKS) $(TARGET_RECOVERY_ROOT_OUT)/sbin/
+TARGET_RELINK_FILES := $(notdir $(RELINK_SOURCE_FILES))
+TARGET_BASE_RELINK_MODULES := $(basename $(TARGET_RELINK_FILES))
+TARGET_RELINK_MODULES :=  $(filter-out libdexfile, $(TARGET_BASE_RELINK_MODULES))
+LOCAL_REQUIRED_MODULES += $(TARGET_RELINK_MODULES)
 include $(BUILD_PHONY_PACKAGE)
 
 #relink init