Skip to content

Commit 4e66cdd

Browse files
committed
Use simdutf submodule
1 parent c3fab08 commit 4e66cdd

5 files changed

Lines changed: 26 additions & 6 deletions

File tree

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "packages/react-native-quick-crypto/deps/ncrypto"]
55
path = packages/react-native-quick-crypto/deps/ncrypto
66
url = https://github.com/nodejs/ncrypto.git
7+
[submodule "packages/react-native-quick-crypto/deps/simdutf"]
8+
path = packages/react-native-quick-crypto/deps/simdutf
9+
url = https://github.com/simdutf/simdutf.git

example/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2815,7 +2815,7 @@ SPEC CHECKSUMS:
28152815
NitroMmkv: afbc5b2fbf963be567c6c545aa1efcf6a9cec68e
28162816
NitroModules: 11bba9d065af151eae51e38a6425e04c3b223ff3
28172817
OpenSSL-Universal: 9110d21982bb7e8b22a962b6db56a8aa805afde7
2818-
QuickCrypto: 5832fe0a64e543f428d1484cb8610c5beb2d489f
2818+
QuickCrypto: 706bcc29f0cf2b628721f705bd700ad906a43f91
28192819
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
28202820
RCTDeprecation: c4b9e2fd0ab200e3af72b013ed6113187c607077
28212821
RCTRequired: e97dd5dafc1db8094e63bc5031e0371f092ae92a

packages/react-native-quick-crypto/QuickCrypto.podspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ Pod::Spec.new do |s|
8383
"deps/ncrypto/include/**/*.{h}",
8484
"deps/ncrypto/src/*.{cpp}",
8585
# dependencies (C++) - simdutf
86-
"deps/simdutf/*.{h,cpp}",
86+
"deps/simdutf/include/**/*.{h}",
87+
"deps/simdutf/src/simdutf.cpp",
8788
# dependencies (C) - exclude BLAKE3 x86 SIMD files (only use portable + NEON for ARM)
8889
"deps/blake3/c/*.{h,c}",
8990
"deps/fastpbkdf2/*.{h,c}",
@@ -153,7 +154,8 @@ Pod::Spec.new do |s|
153154
"\"$(PODS_TARGET_SRCROOT)/cpp/ecdh\"",
154155
"\"$(PODS_TARGET_SRCROOT)/nitrogen/generated/shared/c++\"",
155156
"\"$(PODS_TARGET_SRCROOT)/deps/ncrypto/include\"",
156-
"\"$(PODS_TARGET_SRCROOT)/deps/simdutf\"",
157+
"\"$(PODS_TARGET_SRCROOT)/deps/simdutf/include\"",
158+
"\"$(PODS_TARGET_SRCROOT)/deps/simdutf/src\"",
157159
"\"$(PODS_TARGET_SRCROOT)/deps/blake3/c\"",
158160
"\"$(PODS_TARGET_SRCROOT)/deps/fastpbkdf2\""
159161
]

packages/react-native-quick-crypto/android/CMakeLists.txt

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.10.0)
1+
cmake_minimum_required(VERSION 3.15)
22
project(QuickCrypto)
33

44
set(PACKAGE_NAME QuickCrypto)
@@ -62,7 +62,6 @@ add_library(
6262
../cpp/x509/HybridX509Certificate.cpp
6363
../cpp/utils/HybridUtils.cpp
6464
../cpp/utils/QuickCryptoUtils.cpp
65-
../deps/simdutf/simdutf.cpp
6665
${BLAKE3_SOURCES}
6766
../deps/fastpbkdf2/fastpbkdf2.c
6867
../deps/ncrypto/src/aead.cpp
@@ -103,7 +102,6 @@ include_directories(
103102
"../deps/blake3/c"
104103
"../deps/fastpbkdf2"
105104
"../deps/ncrypto/include"
106-
"../deps/simdutf"
107105
)
108106

109107
# Third party libraries (Prefabs)
@@ -141,3 +139,19 @@ else()
141139
ReactAndroid::turbomodulejsijni # <-- RN: TurboModules utils (e.g. CallInvokerHolder)
142140
)
143141
endif()
142+
143+
# simdutf
144+
set(SIMDUTF_TESTS OFF CACHE BOOL "" FORCE)
145+
set(SIMDUTF_TOOLS OFF CACHE BOOL "" FORCE)
146+
set(SIMDUTF_ICONV OFF CACHE BOOL "" FORCE)
147+
148+
add_subdirectory(
149+
${CMAKE_CURRENT_SOURCE_DIR}/../deps/simdutf
150+
${CMAKE_CURRENT_BINARY_DIR}/simdutf-build
151+
EXCLUDE_FROM_ALL
152+
)
153+
154+
target_link_libraries(
155+
${PACKAGE_NAME}
156+
simdutf::simdutf
157+
)
Submodule simdutf added at fd47622

0 commit comments

Comments
 (0)