[IOT-2037] Resolved android crash

Change-Id: I9c54cc3fea321ad2f5b657eb0784ef707070dace
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18895
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/java/jni/JniOcStack.cpp b/java/jni/JniOcStack.cpp
index 95cd5a8..0f2df49 100644 (file)
--- a/java/jni/JniOcStack.cpp
+++ b/java/jni/JniOcStack.cpp
@@ -616,6 +616,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved)
 
     g_mid_OcOicSecPdAcl_get_recurrences = env->GetMethodID(g_cls_OcOicSecPdAcl, "getRecurrences", "(I)Ljava/lang/String;");
     VERIFY_VARIABLE_NULL(g_mid_OcOicSecPdAcl_get_recurrences);
+#ifdef SECURED
 #ifdef WITH_CLOUD
 #ifdef __WITH_TLS__
     //OcCloudProvisioning
@@ -631,6 +632,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved)
     VERIFY_VARIABLE_NULL(g_mid_OcCloudProvisioning_getPort);
 #endif
 #endif
+#endif
     return JNI_CURRENT_VERSION;
 }
 

diff --git a/java/jni/SConscript b/java/jni/SConscript
index ac245ec..57fca27 100644 (file)
--- a/java/jni/SConscript
+++ b/java/jni/SConscript
@@ -85,6 +85,9 @@ if target_os == 'android':
 if target_os in ['darwin', 'ios']:
        jni_env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE'])
 
+if env.get('SECURED') == '1':
+       jni_env.AppendUnique(CPPDEFINES=['SECURED'])
+
 if env.get('WITH_CLOUD'):
        jni_env.AppendUnique(CPPDEFINES = ['WITH_CLOUD'])