From: Ji-hoon Lee Date: Wed, 13 Feb 2019 07:21:40 +0000 (+0900) Subject: Replace multi-wakeup recognizer with dummy X-Git-Tag: submit/tizen/20190213.101901~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F199596%2F2;p=platform%2Fcore%2Fuifw%2Fwakeup-engine-default.git Replace multi-wakeup recognizer with dummy Change-Id: I9f51120a2091aed216639430e4038cf941f0af98 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9483a17..ddb18cf 100644 --- 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 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 33c30bc..b3c32f5 100644 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 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 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 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 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 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 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 eb293a9..4024933 100644 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 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 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 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 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 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 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 a7c7fa2..0eb8d5e 100644 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 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 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 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 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 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 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 f77580b..f42f388 100644 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 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 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 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 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 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 d56ad44..5832e1a 100644 --- 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