Replace multi-wakeup recognizer with dummy

Change-Id: I9f51120a2091aed216639430e4038cf941f0af98

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9483a17ba5424bd3edc8ffae2b30308b5f7cd794..ddb18cfd5a9b6346702af64daf36e74f5b752bc6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,9 +36,6 @@ FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-#SET(COMMON_LIBS easr-nlu embeddedasr wakeup-verify )
-SET(COMMON_LIBS multi-wakeup-recognizer boost_iostream n66asrdll opus speex voiceactivity voice-transport)
-
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fPIE -std=gnu++0x -mthumb -Wa,-mimplicit-it=thumb -fvisibility=hidden -fvisibility-inlines-hidden")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE -fvisibility=hidden")
@@ -71,8 +68,6 @@ SET(SRCS
 )
 ADD_EXECUTABLE(${BINNAME} ${SRCS})
 
-#TARGET_LINK_LIBRARIES(${BINNAME} -Llib -lopus -lboost_iostreams -ln66asrdll -lspeex -lvoiceactivity -lvoice-transport -lmulti-wakeup-recognizer ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
-
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.Flora DESTINATION /usr/share/license/)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml DESTINATION /usr/share/packages)
 INSTALL(TARGETS ${BINNAME} DESTINATION ${BINDIR})
@@ -83,49 +78,19 @@ 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 -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
+TARGET_LINK_LIBRARIES(${BINNAME} -Llib/armv7l -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)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libn66asrdll.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libspeex.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libvoiceactivity.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libvoice-transport.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
 ELSEIF("${ARCH}" MATCHES "^i586.*")
-TARGET_LINK_LIBRARIES(${BINNAME} -Llib/i586 -lopus -lboost_iostreams -ln66asrdll -lspeex -lvoiceactivity -lvoice-transport -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
+TARGET_LINK_LIBRARIES(${BINNAME} -Llib/i586 -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libmulti-wakeup-recognizer.so DESTINATION ${TZ_SYS_RO_SHARE}/multiassistant/ma/1.0/engine/ COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libopus.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_iostreams.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libn66asrdll.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libspeex.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libvoiceactivity.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libvoice-transport.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
 ELSEIF("${ARCH}" MATCHES "^i686.*")
-TARGET_LINK_LIBRARIES(${BINNAME} -Llib/i586 -lopus -lboost_iostreams -ln66asrdll -lspeex -lvoiceactivity -lvoice-transport -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
+TARGET_LINK_LIBRARIES(${BINNAME} -Llib/i586 -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libmulti-wakeup-recognizer.so DESTINATION ${TZ_SYS_RO_SHARE}/multiassistant/ma/1.0/engine/ COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libopus.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_iostreams.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libn66asrdll.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libspeex.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libvoiceactivity.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libvoice-transport.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
 ELSEIF("${ARCH}" MATCHES "^aarch64.*")
-TARGET_LINK_LIBRARIES(${BINNAME} -Llib/aarch64 -lopus -lboost_iostreams -ln66asrdll -lspeex -lvoiceactivity -lvoice-transport -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
+TARGET_LINK_LIBRARIES(${BINNAME} -Llib/aarch64 -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libmulti-wakeup-recognizer.so DESTINATION ${TZ_SYS_RO_SHARE}/multiassistant/ma/1.0/engine/ COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libopus.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libboost_iostreams.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libn66asrdll.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libspeex.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libvoiceactivity.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libvoice-transport.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
 ELSEIF("${ARCH}" MATCHES "^x86_64.*")
-TARGET_LINK_LIBRARIES(${BINNAME} -Llib/x86_64 -lopus -lboost_iostreams -ln66asrdll -lspeex -lvoiceactivity -lvoice-transport -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
+TARGET_LINK_LIBRARIES(${BINNAME} -Llib/x86_64 -ldl ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libmulti-wakeup-recognizer.so DESTINATION ${TZ_SYS_RO_SHARE}/multiassistant/ma/1.0/engine/ COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libopus.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libboost_iostreams.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libn66asrdll.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libspeex.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libvoiceactivity.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libvoice-transport.so DESTINATION ${PREFIX}/lib COMPONENT RuntimeLibraries)
 ENDIF()
 

diff --git a/lib/aarch64/libboost_iostreams.so b/lib/aarch64/libboost_iostreams.so
deleted file mode 100644 (file)
index 4378c64..0000000
Binary files a/lib/aarch64/libboost_iostreams.so and /dev/null differ

diff --git a/lib/aarch64/libmulti-wakeup-recognizer.so b/lib/aarch64/libmulti-wakeup-recognizer.so
index 33c30bc5569a2af52dbed287ab2f55b215a2bcde..b3c32f515397d3c0762e5c9ce0ee60e4ac0bc22c 100644 (file)
Binary files a/lib/aarch64/libmulti-wakeup-recognizer.so and b/lib/aarch64/libmulti-wakeup-recognizer.so differ

diff --git a/lib/aarch64/libn66asrdll.so b/lib/aarch64/libn66asrdll.so
deleted file mode 100644 (file)
index 39e84f3..0000000
Binary files a/lib/aarch64/libn66asrdll.so and /dev/null differ

diff --git a/lib/aarch64/libopus.so b/lib/aarch64/libopus.so
deleted file mode 100644 (file)
index 337f181..0000000
Binary files a/lib/aarch64/libopus.so and /dev/null differ

diff --git a/lib/aarch64/libspeex.so b/lib/aarch64/libspeex.so
deleted file mode 100644 (file)
index 674f11e..0000000
Binary files a/lib/aarch64/libspeex.so and /dev/null differ

diff --git a/lib/aarch64/libvoice-transport.so b/lib/aarch64/libvoice-transport.so
deleted file mode 100644 (file)
index f98cbdc..0000000
Binary files a/lib/aarch64/libvoice-transport.so and /dev/null differ

diff --git a/lib/aarch64/libvoiceactivity.so b/lib/aarch64/libvoiceactivity.so
deleted file mode 100644 (file)
index 73220fa..0000000
Binary files a/lib/aarch64/libvoiceactivity.so and /dev/null differ

diff --git a/lib/armv7l/libboost_iostreams.so b/lib/armv7l/libboost_iostreams.so
deleted file mode 100644 (file)
index b87cc02..0000000
Binary files a/lib/armv7l/libboost_iostreams.so and /dev/null differ

diff --git a/lib/armv7l/libmulti-wakeup-recognizer.so b/lib/armv7l/libmulti-wakeup-recognizer.so
index eb293a917b4c64005947e3ee1d03f85ee4bbebd9..402493319960085af0b330a0573b4f7dd397a2cf 100644 (file)
Binary files a/lib/armv7l/libmulti-wakeup-recognizer.so and b/lib/armv7l/libmulti-wakeup-recognizer.so differ

diff --git a/lib/armv7l/libn66asrdll.so b/lib/armv7l/libn66asrdll.so
deleted file mode 100644 (file)
index ba52ec7..0000000
Binary files a/lib/armv7l/libn66asrdll.so and /dev/null differ

diff --git a/lib/armv7l/libopus.so b/lib/armv7l/libopus.so
deleted file mode 100644 (file)
index ccec2c9..0000000
Binary files a/lib/armv7l/libopus.so and /dev/null differ

diff --git a/lib/armv7l/libspeex.so b/lib/armv7l/libspeex.so
deleted file mode 100644 (file)
index 369f1f6..0000000
Binary files a/lib/armv7l/libspeex.so and /dev/null differ

diff --git a/lib/armv7l/libvoice-transport.so b/lib/armv7l/libvoice-transport.so
deleted file mode 100644 (file)
index 2e5aac2..0000000
Binary files a/lib/armv7l/libvoice-transport.so and /dev/null differ

diff --git a/lib/armv7l/libvoiceactivity.so b/lib/armv7l/libvoiceactivity.so
deleted file mode 100644 (file)
index 24d205c..0000000
Binary files a/lib/armv7l/libvoiceactivity.so and /dev/null differ

diff --git a/lib/i586/libboost_iostreams.so b/lib/i586/libboost_iostreams.so
deleted file mode 100644 (file)
index 2da0ba0..0000000
Binary files a/lib/i586/libboost_iostreams.so and /dev/null differ

diff --git a/lib/i586/libmulti-wakeup-recognizer.so b/lib/i586/libmulti-wakeup-recognizer.so
index a7c7fa2597e1a7798470cdc5f67a815297e5a1d8..0eb8d5ef27b5ff4012cb48d0fbcf9d2522bc2085 100644 (file)
Binary files a/lib/i586/libmulti-wakeup-recognizer.so and b/lib/i586/libmulti-wakeup-recognizer.so differ

diff --git a/lib/i586/libn66asrdll.so b/lib/i586/libn66asrdll.so
deleted file mode 100644 (file)
index d0c6b7a..0000000
Binary files a/lib/i586/libn66asrdll.so and /dev/null differ

diff --git a/lib/i586/libopus.so b/lib/i586/libopus.so
deleted file mode 100644 (file)
index 01f1ffe..0000000
Binary files a/lib/i586/libopus.so and /dev/null differ

diff --git a/lib/i586/libspeex.so b/lib/i586/libspeex.so
deleted file mode 100644 (file)
index 2ac1b64..0000000
Binary files a/lib/i586/libspeex.so and /dev/null differ

diff --git a/lib/i586/libvoice-transport.so b/lib/i586/libvoice-transport.so
deleted file mode 100644 (file)
index fc3f91b..0000000
Binary files a/lib/i586/libvoice-transport.so and /dev/null differ

diff --git a/lib/i586/libvoiceactivity.so b/lib/i586/libvoiceactivity.so
deleted file mode 100644 (file)
index ea5870a..0000000
Binary files a/lib/i586/libvoiceactivity.so and /dev/null differ

diff --git a/lib/x86_64/libboost_iostreams.so b/lib/x86_64/libboost_iostreams.so
deleted file mode 100644 (file)
index dc5e357..0000000
Binary files a/lib/x86_64/libboost_iostreams.so and /dev/null differ

diff --git a/lib/x86_64/libmulti-wakeup-recognizer.so b/lib/x86_64/libmulti-wakeup-recognizer.so
index f77580b0e21bd15640bb1a62b7a3fbed870a3eff..f42f3881e7bece8fea1a73cb5fb3a6e85ada26e5 100644 (file)
Binary files a/lib/x86_64/libmulti-wakeup-recognizer.so and b/lib/x86_64/libmulti-wakeup-recognizer.so differ

diff --git a/lib/x86_64/libn66asrdll.so b/lib/x86_64/libn66asrdll.so
deleted file mode 100644 (file)
index f631ec7..0000000
Binary files a/lib/x86_64/libn66asrdll.so and /dev/null differ

diff --git a/lib/x86_64/libopus.so b/lib/x86_64/libopus.so
deleted file mode 100644 (file)
index beb869f..0000000
Binary files a/lib/x86_64/libopus.so and /dev/null differ

diff --git a/lib/x86_64/libspeex.so b/lib/x86_64/libspeex.so
deleted file mode 100644 (file)
index d4c7a95..0000000
Binary files a/lib/x86_64/libspeex.so and /dev/null differ

diff --git a/lib/x86_64/libvoice-transport.so b/lib/x86_64/libvoice-transport.so
deleted file mode 100644 (file)
index 16372bc..0000000
Binary files a/lib/x86_64/libvoice-transport.so and /dev/null differ

diff --git a/lib/x86_64/libvoiceactivity.so b/lib/x86_64/libvoiceactivity.so
deleted file mode 100644 (file)
index a289369..0000000
Binary files a/lib/x86_64/libvoiceactivity.so and /dev/null differ

diff --git a/packaging/org.tizen.multi-assistant-service.spec b/packaging/org.tizen.multi-assistant-service.spec
index d56ad4499d25f07b5f5a25668bc29865e753d2a9..5832e1af7ee3d37a4ac5f8ba285e6bbd4b433a95 100644 (file)
--- a/packaging/org.tizen.multi-assistant-service.spec
+++ b/packaging/org.tizen.multi-assistant-service.spec
@@ -72,11 +72,6 @@ cp LICENSE.Flora %{buildroot}%{TZ_SYS_RO_SHARE}/license/%{name}
 mkdir -p %{_bindir}
 mkdir -p %{_libdir}/multiassistant/ma/1.0/engine
 #/usr/bin/signing-client/hash-signer-client.sh -a -d -p platform /usr/apps/org.tizen.multi-assistant-service
-mv %{_appdir}/lib/libboost_iostreams.so %{_appdir}/lib/libboost_iostreams.so.1.58.0
-ln -s %{_appdir}/lib/libboost_iostreams.so.1.58.0 %{_appdir}/lib/libboost_iostreams.so
-mv %{_appdir}/lib/libopus.so %{_appdir}/lib/libopus.so.0.6.1
-ln -s %{_appdir}/lib/libopus.so.0.6.1 %{_appdir}/lib/libopus.so.0
-ln -s %{_appdir}/lib/libopus.so.0.6.1 %{_appdir}/lib/libopus.so
 
 /sbin/ldconfig
 exit 0
@@ -95,7 +90,7 @@ exit 0
 %{TZ_SYS_RO_SHARE}/multiassistant/ma/1.0/engine/libmulti-wakeup-recognizer.so
 %{_appdir}/author-signature.xml
 %{_appdir}/signature1.xml
-%{_appdir}/lib/*
+#%{_appdir}/lib/*
 %{_appdir}/bin/*
 #%defattr(-,app,app,-)
 #%{_bindir}/org.tizen.multi-assistant-service