X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fnotification%2Fandroid%2Fnotification-service%2Fsrc%2Fmain%2Fjni%2FAndroid.mk;h=7def9d801c491da395dea1ea82e3123eebb468c0;hb=8229635f6d207516ccbbdf23b13be164e0fc1787;hp=fa15363654a75503833d732c02cc43d4ab0717a9;hpb=5451f89122eb528aca658d068d7b3d1de9cc2afb;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/notification/android/notification-service/src/main/jni/Android.mk b/service/notification/android/notification-service/src/main/jni/Android.mk
index fa15363..7def9d8 100755
--- a/service/notification/android/notification-service/src/main/jni/Android.mk
+++ b/service/notification/android/notification-service/src/main/jni/Android.mk
@@ -15,6 +15,18 @@ LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libnotification_consumer_wrapper.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
+OIC_LIB_PATH := $(ROOT_PATH)/android/android_api/base/libs/$(TARGET_ARCH_ABI)
+LOCAL_MODULE := android-ocstack
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libocstack-jni.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+OIC_LIB_PATH := $(ROOT_PATH)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
+LOCAL_MODULE := res_directory
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libresource_directory.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
 LOCAL_MODULE := notification_consumer_jni
 LOCAL_CPPFLAGS := -std=c++0x -frtti -fexceptions
 LOCAL_LDLIBS := -llog
@@ -25,7 +37,8 @@ LOCAL_SHARED_LIBRARIES += oc_logger_core
 LOCAL_SHARED_LIBRARIES += oc_logger
 LOCAL_SHARED_LIBRARIES += octbstack
 LOCAL_SHARED_LIBRARIES += oc
-LOCAL_SHARED_LIBRARIES += ocstack-jni
+LOCAL_SHARED_LIBRARIES += android-ocstack
+LOCAL_SHARED_LIBRARIES += notification_consumer
 LOCAL_SHARED_LIBRARIES += notification_consumer_wrapper
 
 OIC_SRC_DIR := ../../../../../..
@@ -36,6 +49,8 @@ LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common/oic_string/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/oc_logger/include
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/boost/boost_1_58_0
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/android/android_api/base/jni
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/notification/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/notification/src/common
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/notification/src/consumer
@@ -51,24 +66,30 @@ LOCAL_SRC_FILES += common/JniNotificationCommon.cpp
 include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 OIC_LIB_PATH := $(ROOT_PATH)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
+LOCAL_MODULE := notification_provider_wrapper
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libnotification_provider_wrapper.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+OIC_LIB_PATH := $(ROOT_PATH)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
 LOCAL_MODULE := notification_provider
 LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libnotification_provider.so
 include $(PREBUILT_SHARED_LIBRARY)
 
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := notification_provider_jni
 LOCAL_CPPFLAGS := -std=c++0x -frtti -fexceptions
 LOCAL_LDLIBS := -llog
 
-LOCAL_STATIC_LIBRARIES := ca_interface
-LOCAL_STATIC_LIBRARIES += ca
-LOCAL_STATIC_LIBRARIES += oc_logger_core
-LOCAL_STATIC_LIBRARIES += oc_logger
-LOCAL_STATIC_LIBRARIES += octbstack
-LOCAL_STATIC_LIBRARIES += oc
-LOCAL_STATIC_LIBRARIES += ocstack-jni
-LOCAL_STATIC_LIBRARIES += notification_provider
+LOCAL_SHARED_LIBRARIES := ca_interface
+LOCAL_SHARED_LIBRARIES += ca
+LOCAL_SHARED_LIBRARIES += oc_logger_core
+LOCAL_SHARED_LIBRARIES += oc_logger
+LOCAL_SHARED_LIBRARIES += octbstack
+LOCAL_SHARED_LIBRARIES += oc
+LOCAL_SHARED_LIBRARIES += android-ocstack
+LOCAL_SHARED_LIBRARIES += notification_provider
+LOCAL_SHARED_LIBRARIES += notification_provider_wrapper
 
 OIC_SRC_DIR := ../../../../../..
 
@@ -76,13 +97,20 @@ LOCAL_C_INCLUDES := $(OIC_SRC_DIR)/resource/csdk/stack/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/logger/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common/oic_string/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/oc_logger/include
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/boost/boost_1_58_0
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/android/android_api/base/jni
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/notification/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/notification/src/common
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/notification/src/provider
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/notification/android/notification-service/src/main/jni/common
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/notification/cpp-wrapper/common
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/notification/cpp-wrapper/provider/inc
 
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/
 
-LOCAL_SRC_FILES := notificationProvider.c
+LOCAL_SRC_FILES := provider/JniNotificationProvider.cpp
+LOCAL_SRC_FILES += common/JniNotificationCommon.cpp
 
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
+include $(BUILD_SHARED_LIBRARY)