syncbase cgo: Fix the compilation warnings on Android
The jni.h is slightly different on Android than a local machine. More
specific, in Android the AttachCurrentThread and AttachCurrentThreadAsDaemon
take as a second argument a JNIEnv** while on the local machine is
void**. This change places those two functions in .c files that use Go
build tags to restrict the compilation to the appropriate
environments.
Change-Id: I6879444837c1e9582923859cdb1d4dc403c16de4
diff --git a/services/syncbase/bridge/cgo/jni_wrapper.c b/services/syncbase/bridge/cgo/jni_wrapper.c
index c411dcc..4e36f47 100644
--- a/services/syncbase/bridge/cgo/jni_wrapper.c
+++ b/services/syncbase/bridge/cgo/jni_wrapper.c
@@ -6,14 +6,6 @@
#include "jni_wrapper.h"
-jint AttachCurrentThread(JavaVM *jvm, JNIEnv **env, void *args) {
- return (*jvm)->AttachCurrentThread(jvm, (void **)env, args);
-}
-
-jint AttachCurrentThreadAsDaemon(JavaVM *jvm, JNIEnv **env, void *args) {
- return (*jvm)->AttachCurrentThreadAsDaemon(jvm, (void **)env, args);
-}
-
jboolean CallBooleanMethodA(JNIEnv *env, jobject obj, jmethodID methodID, jvalue *args) {
return (*env)->CallBooleanMethodA(env, obj, methodID, args);
}
diff --git a/services/syncbase/bridge/cgo/jni_wrapper_android.c b/services/syncbase/bridge/cgo/jni_wrapper_android.c
new file mode 100644
index 0000000..16f542f
--- /dev/null
+++ b/services/syncbase/bridge/cgo/jni_wrapper_android.c
@@ -0,0 +1,15 @@
+// Copyright 2016 The Vanadium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build android
+
+#include "jni_wrapper.h"
+
+jint AttachCurrentThread(JavaVM *jvm, JNIEnv **env, void *args) {
+ return (*jvm)->AttachCurrentThread(jvm, env, args);
+}
+
+jint AttachCurrentThreadAsDaemon(JavaVM *jvm, JNIEnv **env, void *args) {
+ return (*jvm)->AttachCurrentThreadAsDaemon(jvm, env, args);
+}
\ No newline at end of file
diff --git a/services/syncbase/bridge/cgo/jni_wrapper_native.c b/services/syncbase/bridge/cgo/jni_wrapper_native.c
new file mode 100644
index 0000000..3fdec9b
--- /dev/null
+++ b/services/syncbase/bridge/cgo/jni_wrapper_native.c
@@ -0,0 +1,15 @@
+// Copyright 2016 The Vanadium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build java
+
+#include "jni_wrapper.h"
+
+jint AttachCurrentThread(JavaVM *jvm, JNIEnv **env, void *args) {
+ return (*jvm)->AttachCurrentThread(jvm, (void **)env, args);
+}
+
+jint AttachCurrentThreadAsDaemon(JavaVM *jvm, JNIEnv **env, void *args) {
+ return (*jvm)->AttachCurrentThreadAsDaemon(jvm, (void **)env, args);
+}
