[IOT-1089] Change Android build system to accomodate both Android and Generic Java...

[contrib/iotivity.git] / resource / csdk / connectivity / src / adapter_util / caadapterutils.c

diff --git a/resource/csdk/connectivity/src/adapter_util/caadapterutils.c b/resource/csdk/connectivity/src/adapter_util/caadapterutils.c
index 83f24eb..6408562 100644 (file)
--- a/resource/csdk/connectivity/src/adapter_util/caadapterutils.c
+++ b/resource/csdk/connectivity/src/adapter_util/caadapterutils.c
@@ -32,19 +32,16 @@
 #include <netdb.h>
 #endif
 
-#ifdef __ANDROID__
+#ifdef __JAVA__
 #include <jni.h>
-#endif
-
-#define CA_ADAPTER_UTILS_TAG "OIC_CA_ADAP_UTILS"
 
-#ifdef __ANDROID__
 /**
  * @var g_jvm
  * @brief pointer to store JavaVM
  */
 static JavaVM *g_jvm = NULL;
 
+#ifdef __ANDROID__
 /**
  * @var gContext
  * @brief pointer to store context for android callback interface
@@ -52,6 +49,9 @@ static JavaVM *g_jvm = NULL;
 static jobject g_Context = NULL;
 static jobject g_Activity = NULL;
 #endif
+#endif
+
+#define CA_ADAPTER_UTILS_TAG "OIC_CA_ADAP_UTILS"
 
 #ifdef WITH_ARDUINO
 CAResult_t CAParseIPv4AddressInternal(const char *ipAddrStr, uint8_t *ipAddr,
@@ -193,66 +193,33 @@ void CAConvertNameToAddr(const char *host, uint16_t port, struct sockaddr_storag
 }
 #endif // WITH_ARDUINO
 
-#ifdef __ANDROID__
-void CANativeJNISetContext(JNIEnv *env, jobject context)
-{
-    OIC_LOG_V(DEBUG, CA_ADAPTER_UTILS_TAG, "CANativeJNISetContext");
-
-    if (!context)
-    {
-        OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "context is null");
-        return;
-    }
-
-    if (!g_Context)
-    {
-        g_Context = (*env)->NewGlobalRef(env, context);
-    }
-    else
-    {
-        OIC_LOG(INFO, CA_ADAPTER_UTILS_TAG, "context is already set");
-    }
-}
-
+#ifdef __JAVA__
 void CANativeJNISetJavaVM(JavaVM *jvm)
 {
     OIC_LOG_V(DEBUG, CA_ADAPTER_UTILS_TAG, "CANativeJNISetJavaVM");
     g_jvm = jvm;
 }
 
-jobject CANativeJNIGetContext()
-{
-    return g_Context;
-}
-
 JavaVM *CANativeJNIGetJavaVM()
 {
     return g_jvm;
 }
 
-void CANativeSetActivity(JNIEnv *env, jobject activity)
+void CADeleteGlobalReferences(JNIEnv *env)
 {
-    OIC_LOG_V(DEBUG, CA_ADAPTER_UTILS_TAG, "CANativeSetActivity");
-
-    if (!activity)
+#ifdef __ANDROID__
+    if (g_Context)
     {
-        OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "activity is null");
-        return;
+        (*env)->DeleteGlobalRef(env, g_Context);
+        g_Context = NULL;
     }
 
-    if (!g_Activity)
-    {
-        g_Activity = (*env)->NewGlobalRef(env, activity);
-    }
-    else
+    if (g_Activity)
     {
-        OIC_LOG(INFO, CA_ADAPTER_UTILS_TAG, "activity is already set");
+        (*env)->DeleteGlobalRef(env, g_Activity);
+        g_Activity = NULL;
     }
-}
-
-jobject *CANativeGetActivity()
-{
-    return g_Activity;
+#endif
 }
 
 jmethodID CAGetJNIMethodID(JNIEnv *env, const char* className,
@@ -283,18 +250,55 @@ jmethodID CAGetJNIMethodID(JNIEnv *env, const char* className,
     return jni_midID;
 }
 
-void CADeleteGlobalReferences(JNIEnv *env)
+#ifdef __ANDROID__
+void CANativeJNISetContext(JNIEnv *env, jobject context)
 {
-    if (g_Context)
+    OIC_LOG_V(DEBUG, CA_ADAPTER_UTILS_TAG, "CANativeJNISetContext");
+
+    if (!context)
     {
-        (*env)->DeleteGlobalRef(env, g_Context);
-        g_Context = NULL;
+        OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "context is null");
+        return;
     }
 
-    if (g_Activity)
+    if (!g_Context)
     {
-        (*env)->DeleteGlobalRef(env, g_Activity);
-        g_Activity = NULL;
+        g_Context = (*env)->NewGlobalRef(env, context);
+    }
+    else
+    {
+        OIC_LOG(INFO, CA_ADAPTER_UTILS_TAG, "context is already set");
+    }
+}
+
+jobject CANativeJNIGetContext()
+{
+    return g_Context;
+}
+
+void CANativeSetActivity(JNIEnv *env, jobject activity)
+{
+    OIC_LOG_V(DEBUG, CA_ADAPTER_UTILS_TAG, "CANativeSetActivity");
+
+    if (!activity)
+    {
+        OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "activity is null");
+        return;
+    }
+
+    if (!g_Activity)
+    {
+        g_Activity = (*env)->NewGlobalRef(env, activity);
+    }
+    else
+    {
+        OIC_LOG(INFO, CA_ADAPTER_UTILS_TAG, "activity is already set");
     }
 }
+
+jobject *CANativeGetActivity()
+{
+    return g_Activity;
+}
+#endif
 #endif