Commit d3f72431 authored by Randeep's avatar Randeep Committed by Uze Choi

[IOT-2037] Resolved android crash

Change-Id: I9c54cc3fea321ad2f5b657eb0784ef707070dace
Signed-off-by: Randeep's avatarRandeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18895Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: default avatarJaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: default avatarSenthil Kumar G S <senthil.gs@samsung.com>
Reviewed-by: George Nash's avatarGeorge Nash <george.nash@intel.com>
Reviewed-by: Larry Sachs's avatarLarry Sachs <larry.j.sachs@intel.com>
Reviewed-by: default avatarRick Bell <richard.s.bell@intel.com>
Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
Tested-by: default avatarUze Choi <uzchoi@samsung.com>
parent dbbf84ac
......@@ -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
......@@ -630,6 +631,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved)
g_mid_OcCloudProvisioning_getPort = env->GetMethodID(g_cls_OcCloudProvisioning, "getPort", "()I");
VERIFY_VARIABLE_NULL(g_mid_OcCloudProvisioning_getPort);
#endif
#endif
#endif
return JNI_CURRENT_VERSION;
}
......
......@@ -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'])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment