From 113ee7344526132d33349f2c8cae111a6517a733 Mon Sep 17 00:00:00 2001 From: jt1134 Date: Fri, 22 Feb 2013 23:26:10 -0600 Subject: fixes for fakeflash zips For some reason fakeflash doesn't like to have superuser/su in /res, move it to its own subdir in /supersu. This allows a fakeflash zip built with 'make recoveryzip' to work correctly. Change-Id: I32e2e0f6dba55281d5c917e931c3ef0034964bcb --- prebuilt/Android.mk | 6 +++--- recovery.cpp | 2 +- twrp-functions.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index f0c2c264a..d5005e3ec 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -192,7 +192,7 @@ ifneq ($(TW_EXCLUDE_SUPERSU), true) LOCAL_MODULE := su LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES - LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res/supersu + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/supersu LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) @@ -201,7 +201,7 @@ ifneq ($(TW_EXCLUDE_SUPERSU), true) LOCAL_MODULE := Superuser.apk LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES - LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res/supersu + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/supersu LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) -endif \ No newline at end of file +endif diff --git a/recovery.cpp b/recovery.cpp index 4da176a53..4f07fd44c 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -981,7 +981,7 @@ main(int argc, char **argv) { rename("/system/recovery-from-boot.p", "/system/recovery-from-boot.bak"); ui_print("Renamed stock recovery file in /system to prevent\nthe stock ROM from replacing TWRP.\n"); } - if (TWFunc::Path_Exists("/res/supersu/su") && !TWFunc::Path_Exists("/system/bin/su") && !TWFunc::Path_Exists("/system/xbin/su") && !TWFunc::Path_Exists("/system/bin/.ext/.su")) { + if (TWFunc::Path_Exists("/supersu/su") && !TWFunc::Path_Exists("/system/bin/su") && !TWFunc::Path_Exists("/system/xbin/su") && !TWFunc::Path_Exists("/system/bin/.ext/.su")) { // Device doesn't have su installed DataManager_SetIntValue("tw_busy", 1); if (gui_startPage("installsu") != 0) { diff --git a/twrp-functions.cpp b/twrp-functions.cpp index d1f9e3dbd..a90be5a6d 100644 --- a/twrp-functions.cpp +++ b/twrp-functions.cpp @@ -716,11 +716,11 @@ bool TWFunc::Install_SuperSU(void) { if (!PartitionManager.Mount_By_Path("/system", true)) return false; - if (copy_file("/res/supersu/su", "/system/xbin/su", 0755) != 0) { + if (copy_file("/supersu/su", "/system/xbin/su", 0755) != 0) { LOGE("Failed to copy su binary to /system/bin\n"); return false; } - if (copy_file("/res/supersu/Superuser.apk", "/system/app/Superuser.apk", 0644) != 0) { + if (copy_file("/supersu/Superuser.apk", "/system/app/Superuser.apk", 0644) != 0) { LOGE("Failed to copy Superuser app to /system/app\n"); return false; } -- cgit v1.2.3