Android build

hhanh00 · Oct 3, 2024 · c833f0a · c833f0a
1 parent 3989992
commit c833f0a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "dart-warp"]
 	path = dart-warp
 	url = https://github.com/hhanh00/dart-warp.git
+[submodule "ywallet"]
+	path = ywallet
+	url = [email protected]:hhanh00/ywallet.git
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ figment = { version = "0.10.19", features = [ "env", "toml" ] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = [ "env-filter" ] }
 tokio = { version = "1.40", features = ["rt-multi-thread"] }
-tonic = { version = "0.12", features = ["tls", "tls-roots"] }
+tonic = { version = "0.12", features = ["tls", "tls-native-roots", "tls-webpki-roots"] }
 prost = "0.13"
 hex = { version = "0.4", features = ["serde"] }
 r2d2 = "0.8.10"

diff --git a/dart-warp b/dart-warp
diff --git a/ywallet b/ywallet
diff --git a/zcash-warp b/zcash-warp
+6 −0		build-android.sh
+3 −3		src/cli.rs
+3 −2		src/coin.rs
+137 −120		src/db/notes.rs
+2 −2		src/network.rs
+3 −9		src/pay/prepare.rs
+2 −1		src/utils.rs
+3 −6		src/warp/sync/orchard.rs
+3 −5		src/warp/sync/sapling.rs
+2 −7		src/warp/sync/transparent.rs