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
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index f0c2c26..d5005e3 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -192,7 +192,7 @@
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 @@
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 4da176a..4f07fd4 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -981,7 +981,7 @@
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 d1f9e3d..a90be5a 100644
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -716,11 +716,11 @@
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;
}