Skip to content

Commit 8d9f40e

Browse files
committed
chore(jni): use dependencies from librime as much as possible
1 parent e45801a commit 8d9f40e

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

.gitmodules

-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
[submodule "app/src/main/jni/OpenCC"]
22
path = app/src/main/jni/OpenCC
33
url = https://github.com/BYVoid/OpenCC.git
4-
[submodule "app/src/main/jni/yaml-cpp"]
5-
path = app/src/main/jni/yaml-cpp
6-
url = https://github.com/jbeder/yaml-cpp.git
74
[submodule "app/src/main/jni/snappy"]
85
path = app/src/main/jni/snappy
96
url = https://github.com/google/snappy.git
10-
[submodule "app/src/main/jni/leveldb"]
11-
path = app/src/main/jni/leveldb
12-
url = https://github.com/google/leveldb.git
137
[submodule "app/src/main/jni/boost"]
148
path = app/src/main/jni/boost
159
url = https://github.com/boostorg/boost.git

app/src/main/jni/CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@ include(CapnprotoWorkarounds)
2424

2525
#add_subdirectory(glog)
2626

27-
add_subdirectory(yaml-cpp)
27+
option(YAML_CPP_BUILD_TESTS "" OFF)
28+
add_subdirectory(librime/thirdparty/src/yaml-cpp)
2829

2930
option(LEVELDB_BUILD_TESTS "" OFF)
3031
option(LEVELDB_BUILD_BENCHMARKS "" OFF)
3132
option(LEVELDB_INSTALL "" OFF)
32-
add_subdirectory(leveldb)
33+
add_subdirectory(librime/thirdparty/src/leveldb)
3334

35+
# TODO: use librime/thirdparty/src/opencc instead after librime > 1.7.3
3436
add_subdirectory(OpenCC)
3537
include(OpenccWorkarounds)
3638

app/src/main/jni/leveldb

-1
This file was deleted.

app/src/main/jni/yaml-cpp

-1
This file was deleted.

0 commit comments

Comments
 (0)