Commit 8148b55f authored by George Nash's avatar George Nash Committed by Rick Bell

Fix arm64-v8a build errors

Change-Id: Iecff451094731616bbab6b680954e0ec333a61a3
Signed-off-by: George Nash's avatarGeorge Nash <george.nash@intel.com>
parent c5e8171e
...@@ -99,7 +99,11 @@ void CAManagerConnectionStateChangedCB(const CAEndpoint_t *info, ...@@ -99,7 +99,11 @@ void CAManagerConnectionStateChangedCB(const CAEndpoint_t *info,
if (JNI_OK != res) if (JNI_OK != res)
{ {
LOGI("AttachCurrentThread will be called for JNIEnv pointer"); LOGI("AttachCurrentThread will be called for JNIEnv pointer");
#ifdef __ANDROID__
res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL);
#else
res = (*g_jvm)->AttachCurrentThread(g_jvm, (void**) &env, NULL); res = (*g_jvm)->AttachCurrentThread(g_jvm, (void**) &env, NULL);
#endif
if (JNI_OK != res) if (JNI_OK != res)
{ {
...@@ -168,7 +172,11 @@ void CAManagerAdapterStateChangedCB(CATransportAdapter_t adapter, bool enabled) ...@@ -168,7 +172,11 @@ void CAManagerAdapterStateChangedCB(CATransportAdapter_t adapter, bool enabled)
if (JNI_OK != res) if (JNI_OK != res)
{ {
LOGI("AttachCurrentThread will be called for JNIEnv pointer"); LOGI("AttachCurrentThread will be called for JNIEnv pointer");
#ifdef __ANDROID__
res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL);
#else
res = (*g_jvm)->AttachCurrentThread(g_jvm, (void**) &env, NULL); res = (*g_jvm)->AttachCurrentThread(g_jvm, (void**) &env, NULL);
#endif
if (JNI_OK != res) if (JNI_OK != res)
{ {
......
...@@ -162,7 +162,7 @@ OCStackResult JniOcSecureResource::getLinkedDevices(JNIEnv *env, UuidList_t &uui ...@@ -162,7 +162,7 @@ OCStackResult JniOcSecureResource::getLinkedDevices(JNIEnv *env, UuidList_t &uui
OCStackResult JniOcSecureResource::removeDevice(JNIEnv* env, jint timeout, jobject jListener) OCStackResult JniOcSecureResource::removeDevice(JNIEnv* env, jint timeout, jobject jListener)
{ {
if (timeout > USHRT_MAX) if (timeout > static_cast<jint>(USHRT_MAX))
{ {
return OC_STACK_INVALID_PARAM; return OC_STACK_INVALID_PARAM;
} }
......
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