aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoushik Dutta <koushd@gmail.com>2013-05-07 10:17:15 -0700
committerKoushik Dutta <koushd@gmail.com>2013-05-07 10:17:15 -0700
commit5043ef2c5f9fba350df372c1b3c5e1025c2ba9be (patch)
tree664c3e9e8572b041c5df58d5bccddcd6ba5e990c
parentfcf5a008b9f971e60acfa7bfd821b04aec2b2a7f (diff)
downloadbootable_recovery-5043ef2c5f9fba350df372c1b3c5e1025c2ba9be.zip
bootable_recovery-5043ef2c5f9fba350df372c1b3c5e1025c2ba9be.tar.gz
bootable_recovery-5043ef2c5f9fba350df372c1b3c5e1025c2ba9be.tar.bz2
Rename prebuilt recovery su to su.recovery, so it does not interfere with devices that have a shared recovery/boot.
Change-Id: Id542215a31c4617e230474b65ecf54bbc8117d4e
-rw-r--r--extendedcommands.c2
-rw-r--r--su/Android.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/extendedcommands.c b/extendedcommands.c
index 5a1ab6d..6ee9c9d 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -1601,7 +1601,7 @@ int verify_root_and_recovery() {
ui_show_text(1);
ret = 1;
if (confirm_selection("Root access is missing. Root device?", "Yes - Root device (/system/xbin/su)")) {
- __system("cp /sbin/su /system/xbin/su");
+ __system("cp /sbin/su.recovery /system/xbin/su");
__system("chmod 6755 /system/xbin/su");
__system("ln -sf /system/xbin/su /system/bin/su");
}
diff --git a/su/Android.mk b/su/Android.mk
index 3f4bf2e..6458e8e 100644
--- a/su/Android.mk
+++ b/su/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE := su
+LOCAL_MODULE := su.recovery
LOCAL_MODULE_TAGS := eng debug
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_STATIC_LIBRARIES := libc