commit 784073e9fe74cb39f3322d4066e3ee51df8f1805
author Mohd Faraz <mohd.faraz.abc@gmail.com> Mon May 11 01:16:29 2020 +0530
committer mauronofrio <poronofrio@gmail.com> Wed May 20 00:09:55 2020 +0200
tree c8083a23e6fe789a070f0b8a724c256ccd6fd913
parent bb5d66889f011511701b8cbb9e5114675478c846

relink: relink reboot

Signed-off-by: Mohd Faraz <mohd.faraz.abc@gmail.com>
Change-Id: Ie64dad38f1382df5f7bc64f4d21a0602f23b07b1

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 90cbea3..53c3f85 100755
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -370,7 +370,11 @@
     RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/fsck.f2fs
 endif
 ifneq ($(wildcard system/core/reboot/Android.*),)
-    RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/reboot
+    ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 29; echo $$?),0)
+        RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/reboot
+    else
+        RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/reboot
+    endif
 endif
 ifneq ($(TW_DISABLE_TTF), true)
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libft2.so
@@ -507,7 +511,7 @@
     mv $(TARGET_RECOVERY_ROOT_OUT)/system/bin/ueventd $(TARGET_RECOVERY_ROOT_OUT)/sbin/ && \
     ln -sf /init $(TARGET_RECOVERY_ROOT_OUT)/sbin/init && \
     ln -sf /init $(TARGET_RECOVERY_ROOT_OUT)/system/bin/init
-LOCAL_REQUIRED_MODULES := init_second_stage.recovery
+LOCAL_REQUIRED_MODULES := init_second_stage.recovery reboot.recovery
 include $(BUILD_PHONY_PACKAGE)
 
 #mke2fs.conf