From c0ea7293468117b56efaaecba83d3ac5ee6bc311 Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Mon, 16 Jan 2017 13:15:47 +0900 Subject: [PATCH] fix java build failure issue Change-Id: I81328799cf95ebd85ea7de72faeef783f7be8e71 Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/16423 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi Reviewed-by: Phil Coval Reviewed-by: Ashok Babu Channa --- resource/csdk/connectivity/api/cautilinterface.h | 2 -- resource/csdk/connectivity/util/src/cautilinterface.c | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/resource/csdk/connectivity/api/cautilinterface.h b/resource/csdk/connectivity/api/cautilinterface.h index 21fd27b..094fdd6 100644 --- a/resource/csdk/connectivity/api/cautilinterface.h +++ b/resource/csdk/connectivity/api/cautilinterface.h @@ -196,7 +196,6 @@ CAResult_t CAUtilSetLEScanInterval(jint intervalTime, jint workingCount); CAResult_t CAUtilStopLEScan(); #endif //__JAVA__ -#if defined(LE_ADAPTER) // BLE util /** * start BLE advertising. @@ -209,7 +208,6 @@ CAResult_t CAUtilStartLEAdvertising(); * @return ::CA_STATUS_OK or ERROR CODES (::CAResult_t error codes in cacommon.h). */ CAResult_t CAUtilStopLEAdvertising(); -#endif // LE_ADAPTER #ifdef __cplusplus } /* extern "C" */ diff --git a/resource/csdk/connectivity/util/src/cautilinterface.c b/resource/csdk/connectivity/util/src/cautilinterface.c index b5690f4..af1118a 100644 --- a/resource/csdk/connectivity/util/src/cautilinterface.c +++ b/resource/csdk/connectivity/util/src/cautilinterface.c @@ -314,11 +314,10 @@ CAResult_t CAUtilStopLEScan() } #endif // __JAVA__ -#if defined(LE_ADAPTER) CAResult_t CAUtilStartLEAdvertising() { OIC_LOG(DEBUG, TAG, "CAUtilStartLEAdvertising"); -#if defined(__ANDROID__) || defined(__TIZEN__) +#if defined(__ANDROID__) return CAManagerLEStartAdvertising(); #else OIC_LOG(DEBUG, TAG, "it is not supported"); @@ -329,11 +328,10 @@ CAResult_t CAUtilStartLEAdvertising() CAResult_t CAUtilStopLEAdvertising() { OIC_LOG(DEBUG, TAG, "CAUtilStopLEAdvertising"); -#if defined(__ANDROID__) || defined(__TIZEN__) +#if defined(__ANDROID__) return CAManagerLEStopAdvertising(); #else OIC_LOG(DEBUG, TAG, "it is not supported"); return CA_NOT_SUPPORTED; #endif } -#endif -- 2.7.4