Track Zygote exec API change.
Manual merge fix for 984d13eb2f20513d175c8b31372bd2b40d2d95f3.
Change-Id: I9cd2d26628b6a45f5a7a9f0762d8e43b1819a2f3
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"),
};