From 784073e9fe74cb39f3322d4066e3ee51df8f1805 Mon Sep 17 00:00:00 2001 From: Mohd Faraz Date: Mon, 11 May 2020 01:16:29 +0530 Subject: [PATCH] relink: relink reboot Signed-off-by: Mohd Faraz Change-Id: Ie64dad38f1382df5f7bc64f4d21a0602f23b07b1 --- prebuilt/Android.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 90cbea36..53c3f85b 100755 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -370,7 +370,11 @@ ifeq ($(TARGET_USERIMAGES_USE_F2FS), true) 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 @@ LOCAL_POST_INSTALL_CMD += $(RELINK) $(TARGET_RECOVERY_ROOT_OUT)/ $(RELINK_INIT) 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