Skip to content

Commit 0afc710

Browse files
committed
build(jni): remove capnproto module
librime upstream has dropped it already, and we have detached to the commit after that Ref: rime/librime@3bc4d34
1 parent 84d907b commit 0afc710

File tree

4 files changed

+0
-31
lines changed

4 files changed

+0
-31
lines changed

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
[submodule "librime-octagram"]
2626
path = app/src/main/jni/librime-octagram
2727
url = https://github.com/lotem/librime-octagram.git
28-
[submodule "capnproto"]
29-
path = app/src/main/jni/capnproto
30-
url = https://github.com/capnproto/capnproto.git
3128
[submodule "librime-charcode"]
3229
path = app/src/main/jni/librime-charcode
3330
url = https://github.com/rime/librime-charcode

app/src/main/jni/CMakeLists.txt

-6
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ install(TARGETS iconv EXPORT boost_locale-targets
2121
option(BOOST_FILESYSTEM_DISABLE_STATX "" ON) # remove this option after targetSdkVersion >= 30
2222
add_subdirectory(boost)
2323

24-
option(EXTERNAL_CAPNP "" ON)
25-
option(CAPNP_LITE "" ON) # librime only needs CapnProto::capnp
26-
add_subdirectory(capnproto)
27-
include(CapnprotoWorkarounds)
28-
2924
add_library(miniglog STATIC miniglog/miniglog/logging.cc)
3025
target_link_libraries(miniglog log)
3126
configure_file(
@@ -60,7 +55,6 @@ include(RimePlugins)
6055

6156
option(BUILD_TEST "" OFF)
6257
include_directories("librime/include") # for X11/keysym.h
63-
include_directories("capnproto/c++/src")
6458
# workaround for librime/tools/rime_api_console.cc
6559
# TODO: fix it in upstream
6660
string(REPLACE "-Werror=format-security" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

app/src/main/jni/capnproto

-1
This file was deleted.

app/src/main/jni/cmake/CapnprotoWorkarounds.cmake

-21
This file was deleted.

0 commit comments

Comments
 (0)