Fix the order in which natives are registered.
All the core libraries want from JniHelp during registration is
jniRegisterNativeMethods. JniHelp, though, wants java.io.FileDescriptor from
the core libraries. So we should get to go first.
Bug: 3107501
Change-Id: I9604a3a04343c78577610aa7adf40a1f7d82eeeb
diff --git a/Register.c b/Register.c
index 87017ac..5d7d690 100644
--- a/Register.c
+++ b/Register.c
@@ -28,6 +28,6 @@
*/
int jniRegisterSystemMethods(JNIEnv* env)
{
- // We initialize JNIHelp.c first so that the core libraries can safely rely on it.
- return registerJniHelp(env) != -1 && registerCoreLibrariesJni(env) != -1;
+ // JniHelp depends on core library classes such as java.io.FileDescriptor.
+ return registerCoreLibrariesJni(env) != -1 && registerJniHelp(env) != -1;
}
