fix dynamic loading

Change-Id: I32edf5e41bb1a64884b9ddac6709ef7263737fdd
Signed-off-by: Wonnam Jang <wn.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb7bbc7..d7cf334 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,7 @@ EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
 
 # Install libraries
 IF("${ARCH}" MATCHES "^arm.*")
-TARGET_LINK_LIBRARIES(${BINNAME} -Llib/armv7l -lopus -lboost_iostreams -ln66asrdll -lspeex -lvoiceactivity -lvoice-transport -lmulti-wakeup-recognizer -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
+TARGET_LINK_LIBRARIES(${BINNAME} -Llib/armv7l -lopus -lboost_iostreams -ln66asrdll -lspeex -lvoiceactivity -lvoice-transport -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libmulti-wakeup-recognizer.so DESTINATION ${TZ_SYS_RO_SHARE}/multiassistant/ma/1.0/engine/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libopus.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libboost_iostreams.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)

diff --git a/src/multi_assistant_service.c b/src/multi_assistant_service.c
index 9b0ce1f..3ec6185 100644 (file)
--- a/src/multi_assistant_service.c
+++ b/src/multi_assistant_service.c
@@ -250,7 +250,7 @@ int mas_client_request_speech_data(int pid)
                if (current_maclient_appid && 0 == strncmp(current_maclient_appid, appid, MAX_APPID_LEN)) {
                        MAS_LOGD("appid %s matches with current MA Client, requesting speech data", appid);
                        ma_client_set_temp_speech_data_requested(1);
-                       ret = wakeup_service_request_speech_data();
+                       ret = multi_assistant_service_plugin_request_speech_data();
                        if (0 != ret) {
                                MAS_LOGE("[ERROR] Fail to request speech data(%d)", ret);
                        }
@@ -339,7 +339,7 @@ int mas_ui_client_change_assistant(const char* appid)
        if (mas_get_client_pid_by_appid(appid) != -1) {
                MAS_LOGD("MA Client with appid %s exists, requesting speech data", (appid ? appid : "NULL"));
                ma_client_set_temp_speech_data_requested(1);
-               int ret = wakeup_service_request_speech_data();
+               int ret = multi_assistant_service_plugin_request_speech_data();
                if (0 != ret) {
                        MAS_LOGE("[ERROR] Fail to request speech data(%d)", ret);
                }