diff options
| author | Dave Platt <dplatt@google.com> | 2014-02-13 13:33:54 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-02-19 23:26:22 -0800 |
| commit | 7abfb032393fad97b61c35ec148ca4b58faa5741 (patch) | |
| tree | 42c2910909f6a8696221b83fd32a436edba32276 | |
| parent | 0ba2fc83a4d25ee8781ca5030a365231cf46c5b9 (diff) | |
| download | android_dalvik-7abfb032393fad97b61c35ec148ca4b58faa5741.tar.gz android_dalvik-7abfb032393fad97b61c35ec148ca4b58faa5741.tar.bz2 android_dalvik-7abfb032393fad97b61c35ec148ca4b58faa5741.zip | |
Remove old fork-and-specialize API
As promised, this is the cleanup patch-set which removes the
old native "fork and specialize" API, which has been replaced
by a slightly-enhanced one which can close the Zygote socket
descriptors in the Zygote child.
Change-Id: I33f504afd242e268863270139b4e421d4b0728f2
| -rw-r--r-- | vm/native/dalvik_system_Zygote.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/vm/native/dalvik_system_Zygote.cpp b/vm/native/dalvik_system_Zygote.cpp index fa0cb51fa..d69b19ffc 100644 --- a/vm/native/dalvik_system_Zygote.cpp +++ b/vm/native/dalvik_system_Zygote.cpp @@ -828,27 +828,12 @@ static pid_t forkAndSpecializeCommon(const u4* args, bool isSystemServer, bool l * int[] gids, int debugFlags, int[][] rlimits, int mountExternal, * String seInfo, String niceName, int[] fdsToClose); */ -static void Dalvik_dalvik_system_Zygote_forkAndSpecialize_new(const u4* args, - JValue* pResult) -{ - pid_t pid; - - pid = forkAndSpecializeCommon(args, false, false); - - RETURN_INT(pid); -} - -/* - * native public static int nativeForkAndSpecialize(int uid, int gid, - * int[] gids, int debugFlags, int[][] rlimits, int mountExternal, - * String seInfo, String niceName); - */ static void Dalvik_dalvik_system_Zygote_forkAndSpecialize(const u4* args, JValue* pResult) { pid_t pid; - pid = forkAndSpecializeCommon(args, false, true); + pid = forkAndSpecializeCommon(args, false, false); RETURN_INT(pid); } @@ -886,8 +871,6 @@ const DalvikNativeMethod dvm_dalvik_system_Zygote[] = { { "nativeFork", "()I", Dalvik_dalvik_system_Zygote_fork }, { "nativeForkAndSpecialize", "(II[II[[IILjava/lang/String;Ljava/lang/String;[I)I", - Dalvik_dalvik_system_Zygote_forkAndSpecialize_new }, - { "nativeForkAndSpecialize", "(II[II[[IILjava/lang/String;Ljava/lang/String;)I", Dalvik_dalvik_system_Zygote_forkAndSpecialize }, { "nativeForkSystemServer", "(II[II[[IJJ)I", Dalvik_dalvik_system_Zygote_forkSystemServer }, |