diff --git a/thirdparty/marisa-trie/HPKBUILD b/thirdparty/marisa-trie/HPKBUILD index b5afafcfeff94976a729246db7a587854c88f9f6..6069bf9633e930a3c5ba53fbe57b7bcbe8b35e0d 100644 --- a/thirdparty/marisa-trie/HPKBUILD +++ b/thirdparty/marisa-trie/HPKBUILD @@ -4,8 +4,8 @@ pkgname=marisa-trie pkgver=v0.2.6 pkgrel=0 -pkgdesc="" -url="" +pkgdesc="Matching Algorithm with Recursively Implemented StorAge (MARISA) is a static and space-efficient trie data structure." +url="https://github.com/s-yata/marisa-trie" archs=("armeabi-v7a" "arm64-v8a") license=("LGPL-2.1" "GPL-2.0") depends=() diff --git a/thirdparty/marisa-trie/README_zh.md b/thirdparty/marisa-trie/README_zh.md index 0523f5fea47a0fcb76eed14a6c6ed82e39194b89..83efa77ddd52e0a8e7ed51689ed42ab3ed9a1a43 100755 --- a/thirdparty/marisa-trie/README_zh.md +++ b/thirdparty/marisa-trie/README_zh.md @@ -5,7 +5,7 @@ marisa 递归存储匹配算法种静态的、节省空间的trie数据结构. ## 三方库版本 -- 4.0.0 +- v0.2.6 ## 已适配功能 - 提供字典树数据结构算法,用于生成并加载asr字典树. diff --git a/thirdparty/marisa-trie/docs/hap_integrate.md b/thirdparty/marisa-trie/docs/hap_integrate.md index f032a553f1e7affd352754c75c0e6d6b0046eb6b..b01d290779820252f9075154ee1a6be9d705d267 100755 --- a/thirdparty/marisa-trie/docs/hap_integrate.md +++ b/thirdparty/marisa-trie/docs/hap_integrate.md @@ -46,19 +46,18 @@ ## 应用中使用三方库 -- 在IDE的cpp目录下新增thirdparty目录,将编译生成的库拷贝到该目录下,如下图所示 +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的头文件和库文件拷贝到该目录下,将编译生成的动态库(只需要拷贝soname的so到该目录,否则会增加hap的大小)拷贝到工程的libs目录下。如下图所示: +   -  ![thirdparty_install_dir](../../thirdparty_template/docs/pic/xxx_install_dir.png) - - 其中xxx代表的三方库名字,此处即为`marisa-trie`; +  ![marisa_install](pic/marisa_install.png) - 在最外层(cpp目录下)CMakeLists.txt中添加如下语句 ```shell # 将三方库加入工程中 - target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/marisa-trie/${OHOS_ARCH}/lib/libmarisa.a) + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/marisa-trie/${OHOS_ARCH}/lib/libmarisa.so.0) # 将三方库的头文件加入工程中 - target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/marisa/${OHOS_ARCH}/include) + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/marisa-trie/${OHOS_ARCH}/include) ``` diff --git a/thirdparty/marisa-trie/docs/pic/marisa_install.png b/thirdparty/marisa-trie/docs/pic/marisa_install.png new file mode 100644 index 0000000000000000000000000000000000000000..04df2de161354917c5e0df464a8ba13f38d4a302 Binary files /dev/null and b/thirdparty/marisa-trie/docs/pic/marisa_install.png differ