commit f84f99fe3a944310fdfb6f17836079ac5c48c799
author Ian Rogers <irogers@google.com> Wed Feb 06 02:34:22 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 06 02:35:34 2013 +0000
tree dd15102ef2bf43bbc6e0f1d98965f4bb1961060f
parent 45cebaf697e75471a019d01f989ed21d4ae5e1d4
parent 1ffa32f0be7becec4907b26ead353e4b17e1219c

Merge "Reduce inlining in debug builds." into dalvik-dev

src/native/dalvik_system_Zygote.cc

diff --git a/src/native/dalvik_system_Zygote.cc b/src/native/dalvik_system_Zygote.cc
index 8b14117e..3daec75 100644
--- a/src/native/dalvik_system_Zygote.cc
+++ b/src/native/dalvik_system_Zygote.cc
@@ -54,18 +54,6 @@
   MOUNT_EXTERNAL_MULTIUSER = 2,
 };
 
-static void Zygote_nativeExecShell(JNIEnv* env, jclass, jstring javaCommand) {
-  ScopedUtfChars command(env, javaCommand);
-  if (command.c_str() == NULL) {
-    return;
-  }
-  const char* argp[] = {_PATH_BSHELL, "-c", command.c_str(), NULL};
-  LOG(INFO) << "Exec: " << argp[0] << ' ' << argp[1] << ' ' << argp[2];
-
-  execv(_PATH_BSHELL, const_cast<char**>(argp));
-  exit(127);
-}
-
 // This signal handler is for zygote mode, since the zygote must reap its children
 static void SigChldHandler(int /*signal_number*/) {
   pid_t pid;
@@ -489,8 +477,6 @@
 }
 
 static JNINativeMethod gMethods[] = {
-  NATIVE_METHOD(Zygote, nativeExecShell, "(Ljava/lang/String;)V"),
-  //NATIVE_METHOD(Zygote, nativeFork, "()I"),
   NATIVE_METHOD(Zygote, nativeForkAndSpecialize, "(II[II[[IILjava/lang/String;Ljava/lang/String;)I"),
   NATIVE_METHOD(Zygote, nativeForkSystemServer, "(II[II[[IJJ)I"),
 };