Android 5.x向けにライブラリ名を変更

JNI_OnLoad追加
matsumo · Jun 1, 2015 · 146b77b · 146b77b
1 parent 0094954
commit 146b77b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/opus/build.gradle b/opus/build.gradle
@@ -28,7 +28,7 @@ android {
         versionName "1.1.1"
 
         ndk {
-            moduleName "opus"
+            moduleName "droidkit"
 
             cFlags "-DANDROID_NDK " +
                     "-DDISABLE_IMPORTGL " +

diff --git a/opus/src/main/java/com/droidkit/opus/OpusLib.java b/opus/src/main/java/com/droidkit/opus/OpusLib.java
@@ -8,7 +8,7 @@
 public class OpusLib {
 
     static {
-        System.loadLibrary("opus");
+        System.loadLibrary("droidkit");
     }
 
     /**

diff --git a/opus/src/main/jni/audio.c b/opus/src/main/jni/audio.c
@@ -713,3 +713,13 @@ JNIEXPORT int Java_com_droidkit_opus_OpusLib_isOpusFile(JNIEnv *env, jclass clas
 
     return result;
 }
+
+jint JNI_OnLoad(JavaVM *vm, void *reserved)
+{
+    // Get JNI Env for all function calls
+    JNIEnv* env;
+    if ((*vm)->GetEnv(vm, (void **) &env, JNI_VERSION_1_6) != JNI_OK) {
+        return -1;
+    }
+    return JNI_VERSION_1_6;
+}