Removed libcoap.so and added libconnectivity_abstraction.so dependency

in ResourceHostingSample and SampleProvierApp Android.mk files

Change-Id: I3a13319aa1629b7874646f1626cf173ebbe2a09c
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1093
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: RadhaBhavani <radha.p@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: kwon doil <doil.kwon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification-manager/SampleApp/android/ResourceHostingSampleApp/jni/Android.mk b/service/notification-manager/SampleApp/android/ResourceHostingSampleApp/jni/Android.mk
index c6ad183..f2f39d8 100644 (file)
--- a/service/notification-manager/SampleApp/android/ResourceHostingSampleApp/jni/Android.mk
+++ b/service/notification-manager/SampleApp/android/ResourceHostingSampleApp/jni/Android.mk
@@ -1,8 +1,8 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := coap
-LOCAL_SRC_FILES := ../libs/libcoap.so
+LOCAL_MODULE := ca
+LOCAL_SRC_FILES := ../libs/libconnectivity_abstraction.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)

diff --git a/service/notification-manager/SampleApp/android/SampleProviderApp/jni/Android.mk b/service/notification-manager/SampleApp/android/SampleProviderApp/jni/Android.mk
index 9e1da6a..470870f 100644 (file)
--- a/service/notification-manager/SampleApp/android/SampleProviderApp/jni/Android.mk
+++ b/service/notification-manager/SampleApp/android/SampleProviderApp/jni/Android.mk
@@ -20,8 +20,8 @@ include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 OIC_LIB_PATH := ../../../../out/android/$(TARGET_ARCH_ABI)/release
-LOCAL_MODULE := libandroid-coap
-LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libcoap.so
+LOCAL_MODULE := libandroid-ca
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libconnectivity_abstraction.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -51,7 +51,7 @@ LOCAL_SRC_FILES :=  JniOcStack.cpp                                    \
 LOCAL_LDLIBS := -llog
 LOCAL_STATIC_LIBRARIES := android-oc
 LOCAL_STATIC_LIBRARIES += android-octbstack
-LOCAL_STATIC_LIBRARIES += android-coap
+LOCAL_STATIC_LIBRARIES += android-ca
 LOCAL_STATIC_LIBRARIES += android-oc_logger
 LOCAL_CPPFLAGS += -std=c++0x
 LOCAL_CPP_FEATURES := rtti exceptions