summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjt1134 <jt1134@gmail.com>2013-02-23 06:26:10 +0100
committerDees_Troy <dees_troy@teamw.in>2013-02-27 19:50:44 +0100
commit113ee7344526132d33349f2c8cae111a6517a733 (patch)
tree8b011e8fce65dcce9df8a84bf84b4cfff6af60cf
parentMerge "use libblkid to get filesystem type we can now use libblkid to detect exfat" into twrp2.4 (diff)
downloadandroid_bootable_recovery-113ee7344526132d33349f2c8cae111a6517a733.tar
android_bootable_recovery-113ee7344526132d33349f2c8cae111a6517a733.tar.gz
android_bootable_recovery-113ee7344526132d33349f2c8cae111a6517a733.tar.bz2
android_bootable_recovery-113ee7344526132d33349f2c8cae111a6517a733.tar.lz
android_bootable_recovery-113ee7344526132d33349f2c8cae111a6517a733.tar.xz
android_bootable_recovery-113ee7344526132d33349f2c8cae111a6517a733.tar.zst
android_bootable_recovery-113ee7344526132d33349f2c8cae111a6517a733.zip
-rw-r--r--prebuilt/Android.mk6
-rw-r--r--recovery.cpp2
-rw-r--r--twrp-functions.cpp4
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;
}