fixed android build fail with SECURED flag.

 associated with https://gerrit.iotivity.org/gerrit/#/c/11331/25

Change-Id: I7b2aa38167d5573bd9b845c1d2e604c9ec23a3f4
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12153
Reviewed-by: Ashwini  Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/android/android_api/base/jni/Android.mk b/android/android_api/base/jni/Android.mk
index d0426e0..1c43294 100644 (file)
--- a/android/android_api/base/jni/Android.mk
+++ b/android/android_api/base/jni/Android.mk
@@ -158,11 +158,12 @@ 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/oxm/\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/internal\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
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/connectivity/inc/pkix\r
-LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/connectivity/lib/libcoap-4.1.1\r
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/connectivity/lib/libcoap-4.1.1/include\r
 include $(BUILD_SHARED_LIBRARY)\r

diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
old mode 100644 (file)
new mode 100755 (executable)
index 0bbd574..3ff2d43
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
@@ -79,6 +79,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                                        $(LOCAL_PATH)/../../../../../../../../../resource/csdk/stack/include \
                                        $(LOCAL_PATH)/../../../../../../../../../resource/csdk/logger/include \
                                        $(LOCAL_PATH)/../../../../../../../../../resource/csdk/security/include \
+                                       $(LOCAL_PATH)/../../../../../../../../../resource/csdk/security/provisioning/include \
+                                       $(LOCAL_PATH)/../../../../../../../../../resource/csdk/security/provisioning/include/cloud \
+                                       $(LOCAL_PATH)/../../../../../../../../../resource/csdk/security/provisioning/include/oxm \
                                        $(LOCAL_PATH)/../../../../../../../../../extlibs/cjson \
                                        $(LOCAL_PATH)/../../../../../../../../../extlibs/boost/boost_1_58_0 \
                                        $(LOCAL_PATH)/../../../../../../../../../extlibs/timer \