replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / resource / csdk / connectivity / build / android / jni / Android.mk

diff --git a/resource/csdk/connectivity/build/android/jni/Android.mk b/resource/csdk/connectivity/build/android/jni/Android.mk
index 104f536..1f255a1 100644 (file)
--- a/resource/csdk/connectivity/build/android/jni/Android.mk
+++ b/resource/csdk/connectivity/build/android/jni/Android.mk
@@ -13,7 +13,7 @@ $(info PLATFORM=$(APP_PLATFORM))
 BUILD = debug
 
 PROJECT_ROOT_PATH           ?= ../..
-ROOT_DIR_PATH               = ../../../../../..
+ROOT_DIR_PATH               = $(PROJECT_ROOT_PATH)/../../..
 EXT_LIB_PATH                = $(ROOT_DIR_PATH)/extlibs
 PROJECT_API_PATH            = $(PROJECT_ROOT_PATH)/api
 PROJECT_INC_PATH            = $(PROJECT_ROOT_PATH)/inc
@@ -23,7 +23,6 @@ PROJECT_COMMON_INC_PATH     = $(PROJECT_COMMON_PATH)/inc
 PROJECT_COMMON_SRC_PATH     = $(PROJECT_COMMON_PATH)/src
 PROJECT_LIB_PATH            = $(PROJECT_ROOT_PATH)/lib
 PROJECT_EXTERNAL_PATH       = $(PROJECT_ROOT_PATH)/external/inc
-DTLS_LIB                    = $(EXT_LIB_PATH)/tinydtls
 OIC_C_COMMON_PATH           = $(ROOT_DIR_PATH)/resource/c_common
 #GLIB_PATH                  = ../../../../../../extlibs/glib/glib-2.40.2
 
@@ -32,11 +31,12 @@ OIC_C_COMMON_PATH           = $(ROOT_DIR_PATH)/resource/c_common
 EDR             = EDR_ADAPTER
 IP              = IP_ADAPTER
 LE              = LE_ADAPTER
+NFC             = NFC_ADAPTER
 
 #Add Pre processor definitions
 DEFINE_FLAG =  -DWITH_POSIX -D__ANDROID__
-DEFINE_FLAG =  -D__WITH_DTLS__
-DEFINE_FLAG += -D$(EDR) -D$(LE) -D$(IP)
+DEFINE_FLAG +=  -D__WITH_DTLS__
+DEFINE_FLAG += -D$(EDR) -D$(LE) -D$(IP) -D$(NFC)
 
 #Add Debug flags here
 DEBUG_FLAG      = -DTB_LOG
@@ -46,36 +46,6 @@ BUILD_FLAG.release      =       $(DEFINE_FLAG)
 BUILD_FLAG = $(BUILD_FLAG.$(BUILD))
 
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#include glib
-
-#include $(CLEAR_VARS)
-#LOCAL_PATH = $(PROJECT_LIB_PATH)/android
-#LOCAL_MODULE = Glib
-#LOCAL_SRC_FILES := libglib-2.40.2.so
-#LOCAL_EXPORT_C_INCLUDES = $(GLIB_PATH) \
-#                          $(GLIB_PATH)/glib
-#
-#include $(PREBUILT_SHARED_LIBRARY)
-
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#include glibthread
-
-#include $(CLEAR_VARS)
-#LOCAL_PATH = $(PROJECT_LIB_PATH)/android
-#LOCAL_MODULE = GLibThread
-#LOCAL_SRC_FILES := libgthread-2.40.2.so
-#LOCAL_EXPORT_C_INCLUDES = $(GLIB_PATH) \
-#                          $(GLIB_PATH)/glib
-#
-#include $(PREBUILT_SHARED_LIBRARY)
-
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#Build TinyDtls
-
-include $(CLEAR_VARS)
-include $(DTLS_LIB)/Android.mk
-
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #Build OIC C Common libraries required for CA
 
 include $(CLEAR_VARS)
@@ -116,7 +86,8 @@ LOCAL_C_INCLUDES += $(OIC_C_COMMON_PATH)/oic_string/include
 
 LOCAL_SRC_FILES =       oic_logger.c oic_console_logger.c logger.c \
                         uarraylist.c uqueue.c \
-                        cathreadpool_pthreads.c camutex_pthreads.c
+                        cathreadpool_pthreads.c camutex_pthreads.c \
+                        caremotehandler.c
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -153,7 +124,7 @@ LOCAL_LDLIBS += -L$(SYSROOT)/usr/lib -llog
 LOCAL_PATH = $(PROJECT_SRC_PATH)
 LOCAL_MODULE = CA
 
-LOCAL_STATIC_LIBRARIES = CACommon CACoap TinyDtls
+LOCAL_STATIC_LIBRARIES = CACommon CACoap
 
 LOCAL_C_INCLUDES = $(PROJECT_API_PATH)
 LOCAL_C_INCLUDES += $(PROJECT_COMMON_INC_PATH)
@@ -166,14 +137,13 @@ LOCAL_C_INCLUDES += $(OIC_C_COMMON_PATH)/oic_string/include
 LOCAL_C_INCLUDES += $(DTLS_LIB)
 
 LOCAL_CFLAGS += $(BUILD_FLAG)
-LOCAL_CFLAGS += -std=c99 -DWITH_POSIX
+LOCAL_CFLAGS += -std=c99 -DWITH_POSIX -DWITH_BWT
 
 LOCAL_SRC_FILES = \
-                caconnectivitymanager.c caremotehandler.c cainterfacecontroller.c \
+                caconnectivitymanager.c cainterfacecontroller.c \
                 camessagehandler.c canetworkconfigurator.c caprotocolmessage.c \
-                caretransmission.c caqueueingthread.c \
+                caretransmission.c caqueueingthread.c cablockwisetransfer.c \
                 $(ADAPTER_UTILS)/caadapternetdtls.c $(ADAPTER_UTILS)/caadapterutils.c \
-                $(ADAPTER_UTILS)/cafragmentation.c \
                 bt_le_adapter/caleadapter.c $(LE_ADAPTER_PATH)/caleclient.c \
                 $(LE_ADAPTER_PATH)/caleserver.c $(LE_ADAPTER_PATH)/caleutils.c \
                 $(LE_ADAPTER_PATH)/calenwmonitor.c \
@@ -181,7 +151,7 @@ LOCAL_SRC_FILES = \
                 $(EDR_ADAPTER_PATH)/caedrclient.c $(EDR_ADAPTER_PATH)/caedrserver.c \
                 $(EDR_ADAPTER_PATH)/caedrnwmonitor.c \
                 $(IP_ADAPTER_PATH)/caipadapter.c $(IP_ADAPTER_PATH)/caipserver.c \
-                $(IP_ADAPTER_PATH)/caipclient.c $(IP_ADAPTER_PATH)/android/caipnwmonitor.c \
+                $(IP_ADAPTER_PATH)/android/caipnwmonitor.c \
+                nfc_adapter/canfcadapter.c nfc_adapter/android/canfcserver.c
 
 include $(BUILD_STATIC_LIBRARY)
-