From 6dc39ad356a704bc98d1374de607bf130a821b35 Mon Sep 17 00:00:00 2001 From: wxyzh Date: Tue, 31 Oct 2023 12:23:37 +0800 Subject: [PATCH] Add librime-predict update OpenCC and librime-lua --- .gitmodules | 3 +++ app/src/main/jni/OpenCC | 2 +- app/src/main/jni/cmake/RimePlugins.cmake | 1 + app/src/main/jni/librime | 2 +- app/src/main/jni/librime-lua | 2 +- app/src/main/jni/librime-lua-deps | 2 +- app/src/main/jni/librime-predict | 1 + app/src/main/jni/librime_jni/rime_jni.cc | 2 ++ 8 files changed, 11 insertions(+), 4 deletions(-) create mode 160000 app/src/main/jni/librime-predict diff --git a/.gitmodules b/.gitmodules index d9153c3491..22b8593b3e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "librime-charcode"] path = app/src/main/jni/librime-charcode url = https://github.com/rime/librime-charcode +[submodule "app/src/main/jni/librime-predict"] + path = app/src/main/jni/librime-predict + url = https://github.com/rime/librime-predict diff --git a/app/src/main/jni/OpenCC b/app/src/main/jni/OpenCC index c3caa5f022..e5d6c5f1b7 160000 --- a/app/src/main/jni/OpenCC +++ b/app/src/main/jni/OpenCC @@ -1 +1 @@ -Subproject commit c3caa5f0221aeaf6ace45b37a608a236272a796c +Subproject commit e5d6c5f1b78e28a5797e7ad3ede3513314e544b7 diff --git a/app/src/main/jni/cmake/RimePlugins.cmake b/app/src/main/jni/cmake/RimePlugins.cmake index 26d82908ee..e2235ae2ab 100644 --- a/app/src/main/jni/cmake/RimePlugins.cmake +++ b/app/src/main/jni/cmake/RimePlugins.cmake @@ -3,6 +3,7 @@ set(RIME_PLUGINS librime-lua librime-charcode librime-octagram + librime-predict ) # plugins didn't use target_link_libraries, the usage-requirements won't work, include manually diff --git a/app/src/main/jni/librime b/app/src/main/jni/librime index a60876745a..e42851c017 160000 --- a/app/src/main/jni/librime +++ b/app/src/main/jni/librime @@ -1 +1 @@ -Subproject commit a60876745af20ecc8489ec6997c6c195949b99ac +Subproject commit e42851c017c0052436bef9c4a920ade1a57a1255 diff --git a/app/src/main/jni/librime-lua b/app/src/main/jni/librime-lua index 03a2bd9e17..1e3ab10594 160000 --- a/app/src/main/jni/librime-lua +++ b/app/src/main/jni/librime-lua @@ -1 +1 @@ -Subproject commit 03a2bd9e172549cb16c0718b2c9b68e8c5678085 +Subproject commit 1e3ab105947299b36b4e6879522299677f99ea8a diff --git a/app/src/main/jni/librime-lua-deps b/app/src/main/jni/librime-lua-deps index b59a6b0536..9c53b36222 160000 --- a/app/src/main/jni/librime-lua-deps +++ b/app/src/main/jni/librime-lua-deps @@ -1 +1 @@ -Subproject commit b59a6b0536e0608aa2667ba02f3ec4434cdeeb93 +Subproject commit 9c53b362229766a97b83683b9541c46679118a90 diff --git a/app/src/main/jni/librime-predict b/app/src/main/jni/librime-predict new file mode 160000 index 0000000000..dbe622ffa8 --- /dev/null +++ b/app/src/main/jni/librime-predict @@ -0,0 +1 @@ +Subproject commit dbe622ffa8b34b1cc47ffa3ea680f865a3d2aaa5 diff --git a/app/src/main/jni/librime_jni/rime_jni.cc b/app/src/main/jni/librime_jni/rime_jni.cc index 0dfd132b22..8be81213fe 100644 --- a/app/src/main/jni/librime_jni/rime_jni.cc +++ b/app/src/main/jni/librime_jni/rime_jni.cc @@ -10,11 +10,13 @@ extern void rime_require_module_lua(); extern void rime_require_module_charcode(); extern void rime_require_module_octagram(); +extern void rime_require_module_predict(); // librime is compiled as a static library, we have to link modules explicitly static void declare_librime_module_dependencies() { rime_require_module_lua(); rime_require_module_charcode(); rime_require_module_octagram(); + rime_require_module_predict(); } class Rime {