commit 4549416cd11443df4ac75608d0357bfcc134b527
author Captain Throwback <captainthrowback@hotmail.com> Tue Apr 05 10:15:08 2022 -0400
committer bigbiff <bigbiff@teamw.in> Sat May 28 17:52:27 2022 +0000
tree ba9e045347bff12e6b7d997421bedf090ae671a0
parent 630fd66b96a811822e833c69377622828b128b94

Fix copy commands for bash and nano

Change-Id: I5c2e5d3ae40732d1e43a14be34d113301521f302

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index be0ab70..ec633b0 100755
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -343,14 +343,15 @@
 RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_misc.so
 
 ifneq ($(TW_EXCLUDE_NANO), true)
-    RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/nano
-    RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libncurses.so
-    RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libssh.so
+    RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_SYSTEM_EXT_EXECUTABLES)/nano
+    RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES)/libncurses.so
+    RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/libssh.so
     RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libssl.so
 endif
 
 ifneq ($(TW_EXCLUDE_BASH), true)
-    RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/bash
+    RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_SYSTEM_EXT_EXECUTABLES)/bash
+    RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES)/libncurses.so
 endif
 
 include $(CLEAR_VARS)
@@ -564,7 +565,7 @@
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/system/bin
 LOCAL_REQUIRED_MODULES := nano libncurses
 LOCAL_POST_INSTALL_CMD += \
-    cp -rf $(TARGET_OUT_ETC)/nano $(TARGET_RECOVERY_ROOT_OUT)/system/etc/; \
+    cp -rf $(TARGET_OUT_SYSTEM_EXT_ETC)/nano $(TARGET_RECOVERY_ROOT_OUT)/system/etc/; \
     cp -rf external/libncurses/lib/terminfo $(TARGET_RECOVERY_ROOT_OUT)/system/etc/;
 include $(BUILD_PHONY_PACKAGE)