Fix android run time to load ocprovision

- ocprovision has moved from static to shared lib
- build dependecncy for include file

Change-Id: I5d2ba0ecd506c3e3dfd15ff2670d2eb322de61e3
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5885
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

diff --git a/android/android_api/base/jni/Android.mk b/android/android_api/base/jni/Android.mk
index 0bc2d5e..08f2b79 100644 (file)
--- a/android/android_api/base/jni/Android.mk
+++ b/android/android_api/base/jni/Android.mk
@@ -111,4 +111,5 @@ LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include
 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/connectivity/api\r
 include $(BUILD_SHARED_LIBRARY)\r

diff --git a/android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java b/android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
index da9c25e..381f36b 100644 (file)
--- a/android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
+++ b/android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
@@ -40,6 +40,7 @@ public final class OcPlatform {
         System.loadLibrary("octbstack");
         System.loadLibrary("connectivity_abstraction");
         System.loadLibrary("oc");
+        System.loadLibrary("ocprovision");
         System.loadLibrary("ocstack-jni");
     }