From: Jaewook Jung Date: Thu, 25 Aug 2016 07:42:12 +0000 (+0900) Subject: resolve build warnings for android X-Git-Tag: 1.2.0+RC1~43 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a198f986456d3fe4a81dc70008067886a365eed2;p=platform%2Fupstream%2Fiotivity.git resolve build warnings for android resolve build warnings for android Change-Id: I2c7bf77635deffc26e1ed1005750842f26e1730f Signed-off-by: Jaewook Jung Reviewed-on: https://gerrit.iotivity.org/gerrit/10903 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c index 3b434ea..cbd5dbd 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c @@ -708,6 +708,9 @@ CAResult_t CALEClientSendMulticastMessage(const uint8_t* data, CAResult_t CALEClientStartUnicastServer(const char* address) { +#ifndef TB_LOG + (void)address; +#endif OIC_LOG_V(DEBUG, TAG, "it is not needed in this platform (%s)", address); return CA_NOT_SUPPORTED; diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c index ec1555f..b722c01 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c @@ -2274,6 +2274,9 @@ Java_org_iotivity_ca_CaLeServerInterface_caLeGattServerConnectionStateChangeCall } else { +#ifndef TB_LOG + (void)status; +#endif OIC_LOG_V(DEBUG, TAG, "LE Connection state is [newState : %d, status %d]", newState, status); } @@ -2288,7 +2291,9 @@ Java_org_iotivity_ca_CaLeServerInterface_caLeGattServerServiceAddedCallback(JNIE VERIFY_NON_NULL_VOID(env, TAG, "env"); VERIFY_NON_NULL_VOID(obj, TAG, "obj"); VERIFY_NON_NULL_VOID(gattService, TAG, "gattService"); - +#ifndef TB_LOG + (void)status; +#endif OIC_LOG_V(DEBUG, TAG, "Gatt Service Added Callback(%d)", status); } diff --git a/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c b/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c index c77ea8f..874df3a 100644 --- a/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c +++ b/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c @@ -553,6 +553,10 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeRemoteRssiCallback(JNIEnv *e jint rssi, jint status) { +#ifndef TB_LOG + (void)rssi; + (void)status; +#endif OIC_LOG_V(DEBUG, TAG, "caManagerLeRemoteRssiCallback - rssi : %d: ", rssi); OIC_LOG_V(DEBUG, TAG, "caManagerLeRemoteRssiCallback - status : %d: ", status); VERIFY_NON_NULL_VOID(env, TAG, "env"); diff --git a/resource/csdk/connectivity/util/src/cautilinterface.c b/resource/csdk/connectivity/util/src/cautilinterface.c index 8d64dbe..6a848ff 100644 --- a/resource/csdk/connectivity/util/src/cautilinterface.c +++ b/resource/csdk/connectivity/util/src/cautilinterface.c @@ -185,6 +185,12 @@ CAResult_t CAUtilClientInitialize(JNIEnv *env, JavaVM *jvm, jobject context) res = CA_STATUS_FAILED; } #endif + +#if !defined(LE_ADAPTER) && !defined(EDR_ADAPTER) + (void)env; + (void)jvm; + (void)context; +#endif return res; } @@ -255,6 +261,8 @@ CAResult_t CAUtilSetLEScanInterval(jint intervalTime, jint workingCount) CAManagerLESetScanInterval(intervalTime, workingCount); return CA_STATUS_OK; #else + (void)intervalTime; + (void)workingCount; OIC_LOG(DEBUG, TAG, "it is not supported"); return CA_NOT_SUPPORTED; #endif