From a3e17fbbc69f97ea933abae2aaab59a56ad6d723 Mon Sep 17 00:00:00 2001
From: alterdekim <alterwain@protonmail.com>
Date: Tue, 10 Dec 2024 20:38:25 +0300
Subject: [PATCH] modified: Cargo.lock modified:
frida_core/Cargo.toml modified: frida_lib/Cargo.toml renamed:
frida_lib/src/android.rs -> frida_lib/src/lib.rs deleted:
frida_lib/src/main.rs
---
Cargo.lock | 18 ++++++++++++++----
frida_core/Cargo.toml | 8 +-------
frida_lib/Cargo.toml | 16 +++++++++++++++-
frida_lib/src/{android.rs => lib.rs} | 0
frida_lib/src/main.rs | 3 ---
5 files changed, 30 insertions(+), 15 deletions(-)
rename frida_lib/src/{android.rs => lib.rs} (100%)
delete mode 100644 frida_lib/src/main.rs
diff --git a/Cargo.lock b/Cargo.lock
index 929dab7..0fbc4eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1620,14 +1620,10 @@ dependencies = [
"generic-array",
"hex",
"iced",
- "jni 0.20.0",
"log",
- "log4rs",
"nix",
- "nonblock",
"packet",
"rand",
- "robusta_jni",
"serde",
"serde_derive",
"serde_yaml",
@@ -1647,6 +1643,20 @@ version = "0.2.0"
[[package]]
name = "frida_lib"
version = "0.2.0"
+dependencies = [
+ "frida_client",
+ "frida_core",
+ "hex",
+ "jni 0.20.0",
+ "log4rs",
+ "nonblock",
+ "robusta_jni",
+ "serde",
+ "serde_derive",
+ "serde_yaml",
+ "tokio",
+ "tokio-util",
+]
[[package]]
name = "frida_server"
diff --git a/frida_core/Cargo.toml b/frida_core/Cargo.toml
index da98a01..0dd64a0 100644
--- a/frida_core/Cargo.toml
+++ b/frida_core/Cargo.toml
@@ -48,10 +48,4 @@ embed-resource = "2.3"
nix = { version = "0.29.0", features = ["socket"] }
[target.'cfg(target_os="linux")'.dependencies]
-tokio-tun = "0.12.1"
-
-[target.'cfg(target_os="android")'.dependencies]
-jni = "^0.20"
-robusta_jni = "0.2.2"
-nonblock = "0.2.0"
-log4rs = "1.3.0"
\ No newline at end of file
+tokio-tun = "0.12.1"
\ No newline at end of file
diff --git a/frida_lib/Cargo.toml b/frida_lib/Cargo.toml
index 8d72587..3247921 100644
--- a/frida_lib/Cargo.toml
+++ b/frida_lib/Cargo.toml
@@ -11,6 +11,20 @@ workspace = "../"
[lib]
crate-type = ["cdylib"]
-path = "src/android.rs"
+path = "src/lib.rs"
[dependencies]
+hex = "0.4"
+serde_yaml = "0.9.34"
+serde = "1.0"
+serde_derive = "1.0.190"
+tokio = { version = "1", features = ["full", "signal", "tracing"] }
+tokio-util = "0.7.12"
+frida_core = { path = "../frida_core" }
+frida_client = { path = "../frida_client" }
+
+[target.'cfg(target_os="android")'.dependencies]
+jni = "^0.20"
+robusta_jni = "0.2.2"
+nonblock = "0.2.0"
+log4rs = "1.3.0"
diff --git a/frida_lib/src/android.rs b/frida_lib/src/lib.rs
similarity index 100%
rename from frida_lib/src/android.rs
rename to frida_lib/src/lib.rs
diff --git a/frida_lib/src/main.rs b/frida_lib/src/main.rs
deleted file mode 100644
index e7a11a9..0000000
--- a/frida_lib/src/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
- println!("Hello, world!");
-}