commit 43241340b1456eec0a19175d6a642c78f8354ae5
author Nick Kralevich <nnk@google.com> Wed Feb 06 00:14:21 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 06 00:14:21 2013 +0000
tree e034bd6e6d2cd6968c57311bd855276df73f73ea
parent ecc334eaf1dd36f28b9e8402302aa94a57b93274
parent 20f12f4e122649c98439a924d937d279f311cc3d

Merge "Use execv from Libcore"

vm/native/dalvik_system_Zygote.cpp

diff --git a/vm/native/dalvik_system_Zygote.cpp b/vm/native/dalvik_system_Zygote.cpp
index c7746ab..b2b322e 100644
--- a/vm/native/dalvik_system_Zygote.cpp
+++ b/vm/native/dalvik_system_Zygote.cpp
@@ -727,22 +727,6 @@
     RETURN_INT(pid);
 }
 
-/* native private static void nativeExecShell(String command);
- */
-static void Dalvik_dalvik_system_Zygote_execShell(
-        const u4* args, JValue* pResult)
-{
-    StringObject* command = (StringObject*)args[0];
-
-    const char *argp[] = {_PATH_BSHELL, "-c", NULL, NULL};
-    argp[2] = dvmCreateCstrFromString(command);
-
-    ALOGI("Exec: %s %s %s", argp[0], argp[1], argp[2]);
-
-    execv(_PATH_BSHELL, (char**)argp);
-    exit(127);
-}
-
 const DalvikNativeMethod dvm_dalvik_system_Zygote[] = {
     { "nativeFork", "()I",
       Dalvik_dalvik_system_Zygote_fork },
@@ -750,7 +734,5 @@
       Dalvik_dalvik_system_Zygote_forkAndSpecialize },
     { "nativeForkSystemServer", "(II[II[[IJJ)I",
       Dalvik_dalvik_system_Zygote_forkSystemServer },
-    { "nativeExecShell", "(Ljava/lang/String;)V",
-      Dalvik_dalvik_system_Zygote_execShell },
     { NULL, NULL, NULL },
 };