Make libnativehelper stand-alone.cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingjellybean-stablejellybeancm-10.1

Bug: 6369821
Change-Id: I502211bddaf60d6097b81b35f606bbcdd1a3e092

1 files changed, 11 insertions, 5 deletions

diff --git a/JNIHelp.cpp b/JNIHelp.cpp
index bf50930..041776c 100644
--- a/JNIHelp.cpp
+++ b/JNIHelp.cpp
@@ -310,26 +310,32 @@ static struct CachedFields {
     jfieldID descriptorField;
 } gCachedFields;
 
-int registerJniHelp(JNIEnv* env) {
+jint JNI_OnLoad(JavaVM* vm, void*) {
+    JNIEnv* env;
+    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
+        ALOGE("JavaVM::GetEnv() failed");
+        abort();
+    }
+
     gCachedFields.fileDescriptorClass =
             reinterpret_cast<jclass>(env->NewGlobalRef(env->FindClass("java/io/FileDescriptor")));
     if (gCachedFields.fileDescriptorClass == NULL) {
-        return -1;
+        abort();
     }
 
     gCachedFields.fileDescriptorCtor =
             env->GetMethodID(gCachedFields.fileDescriptorClass, "<init>", "()V");
     if (gCachedFields.fileDescriptorCtor == NULL) {
-        return -1;
+        abort();
     }
 
     gCachedFields.descriptorField =
             env->GetFieldID(gCachedFields.fileDescriptorClass, "descriptor", "I");
     if (gCachedFields.descriptorField == NULL) {
-        return -1;
+        abort();
     }
 
-    return 0;
+    return JNI_VERSION_1_6;
 }
 
 jobject jniCreateFileDescriptor(C_JNIEnv* env, int fd) {