X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=android%2Fandroid_api%2Fbase%2Fjni%2FAndroid.mk;h=421050228d1e827963028e7f2f269b3f432d8653;hb=7f00f942c39b7bc27c7eeecf213a239c3fe4173c;hp=59400f29731a2cab52e08f35d16065faad1084b4;hpb=edcfc3d2329da7b914771c0dcff5f42c9b74fd93;p=platform%2Fupstream%2Fiotivity.git

diff --git a/android/android_api/base/jni/Android.mk b/android/android_api/base/jni/Android.mk
index 59400f2..4210502 100644
--- a/android/android_api/base/jni/Android.mk
+++ b/android/android_api/base/jni/Android.mk
@@ -3,6 +3,7 @@ TARGET_ARCH_ABI := $(APP_ABI)
 SECURED := $(SECURE)
 WITH_CLOUD := $(WITH_CLOUD)
 WITH_TCP := $(WITH_TCP)
+TCP_ADAPTER := $(WITH_TCP)
 WITH_MQ_PUB := $(WITH_MQ_PUB)
 WITH_MQ_SUB := $(WITH_MQ_SUB)
 WITH_MQ_BROKER := $(WITH_MQ_BROKER)
@@ -41,6 +42,12 @@ include $(PREBUILT_SHARED_LIBRARY)
 ifeq ($(SECURED), 1)
 include $(CLEAR_VARS)
 OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)
+LOCAL_MODULE := libandroid-mbedtls
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libmbedtls.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)
 LOCAL_MODULE := libandroid-ocprovision
 LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libocprovision.so
 include $(PREBUILT_SHARED_LIBRARY)
@@ -72,9 +79,15 @@ ifeq ($(WITH_CLOUD), 1)
 endif
 
 ifeq ($(WITH_TCP), 1)
-    LOCAL_CPPFLAGS += -D__WITH_TLS__
+    LOCAL_CPPFLAGS += -D__WITH_TLS__ \
+                      -DWITH_TCP
 endif
 
+ifeq ($(TCP_ADAPTER), 1)
+    LOCAL_CPPFLAGS += -DTCP_ADAPTER
+endif
+
+
 MQ_FLAG = 0
 ifeq ($(WITH_MQ_PUB), 1)
 LOCAL_CFLAGS += -DWITH_MQ -DMQ_PUBLISHER
@@ -129,14 +142,17 @@ ifeq ($(SECURED), 1)
                         JniSecureUtils.cpp \
                         JniProvisionResultListner.cpp \
                         JniPinCheckListener.cpp \
-                        JniDisplayPinListener.cpp
+                        JniDisplayPinListener.cpp \
+                        JniDisplayVerifyNumListener.cpp \
+                        JniConfirmNumListener.cpp
 endif
 
 ifeq ($(WITH_CLOUD), 1)
     LOCAL_SRC_FILES +=  JniOcAccountManager.cpp
 endif
 
-ifeq ($(WITH_TCP), 1)
+ifeq ($(TCP_ADAPTER), 1)
+    LOCAL_SRC_FILES += JniKeepAliveListener.cpp
 ifeq ($(SECURED), 1)
     LOCAL_SRC_FILES +=  JniOcCloudProvisioning.cpp \
                         JniOcCloudResultListener.cpp \
@@ -154,6 +170,7 @@ LOCAL_STATIC_LIBRARIES += android_cpp11_compat
 ifeq ($(SECURED), 1)
 LOCAL_STATIC_LIBRARIES += android-ocprovision
 LOCAL_STATIC_LIBRARIES += android-ocpmapi
+LOCAL_STATIC_LIBRARIES += android-mbedtls
 endif
 LOCAL_SHARED_LIBRARIES += android-rd
 
@@ -173,6 +190,7 @@ LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/oc_logger/include
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/boost/boost_1_58_0
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/cjson
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/tinycbor/tinycbor/src
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/mbedtls/mbedtls/include/
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../build_common/android/compatibility
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/oxm/