Andorid(JNI) Implementation for Cloud Provisioning.

[platform/upstream/iotivity.git] / android / android_api / base / jni / Android.mk

diff --git a/android/android_api/base/jni/Android.mk b/android/android_api/base/jni/Android.mk
index 7039ac3..182513d 100644 (file)
--- a/android/android_api/base/jni/Android.mk
+++ b/android/android_api/base/jni/Android.mk
@@ -47,9 +47,6 @@ include $(PREBUILT_SHARED_LIBRARY)
 endif\r
 \r
 include $(CLEAR_VARS)\r
-ifeq ($(SECURE), 1)\r
-    LOCAL_CFLAGS += -D__WITH_DTLS__\r
-endif\r
 OIC_SRC_PATH := ../../../resource\r
 LOCAL_MODULE := libca-interface\r
 LOCAL_SRC_FILES := JniCaInterface.c\r
@@ -69,14 +66,9 @@ ifeq ($(WITH_CLOUD), 1)
 endif\r
 \r
 ifeq ($(WITH_TCP), 1)\r
-    LOCAL_CPPFLAGS += -DWITH_TCP\r
     LOCAL_CPPFLAGS += -D__WITH_TLS__\r
 endif\r
 \r
-ifeq ($(SECURED), 1)\r
-    LOCAL_CPPFLAGS += -D__WITH_DTLS__\r
-endif\r
-\r
 MQ_FLAG = 0\r
 ifeq ($(WITH_MQ_PUB), 1)\r
 LOCAL_CFLAGS += -DWITH_MQ -DMQ_PUBLISHER\r
@@ -137,6 +129,13 @@ ifeq ($(WITH_CLOUD), 1)
     LOCAL_SRC_FILES +=  JniOcAccountManager.cpp\r
 endif\r
 \r
+ifeq ($(WITH_TCP), 1)\r
+    LOCAL_SRC_FILES +=  JniOcCloudProvisioning.cpp \\r
+                        JniOcCloudResultListener.cpp \\r
+                        JniGetAclIdByDeviceListener.cpp\r
+endif\r
+\r
+\r
 LOCAL_LDLIBS := -llog\r
 LOCAL_STATIC_LIBRARIES := android-oc\r
 LOCAL_STATIC_LIBRARIES += android-octbstack\r
@@ -165,9 +164,9 @@ LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/boost/boost_1_58_0
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/cjson\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../build_common/android/compatibility\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include\r
-LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/cloud\r
-LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/oxm\r
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/oxm/\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/internal\r
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/cloud/\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/include\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/include/internal\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/connectivity/api\r