diff --git a/Cargo.lock b/Cargo.lock index 0fbc4eb..2096ef8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1644,10 +1644,12 @@ version = "0.2.0" name = "frida_lib" version = "0.2.0" dependencies = [ + "env_logger", "frida_client", "frida_core", "hex", "jni 0.20.0", + "log", "log4rs", "nonblock", "robusta_jni", diff --git a/frida_lib/Cargo.toml b/frida_lib/Cargo.toml index 3247921..65e95a9 100644 --- a/frida_lib/Cargo.toml +++ b/frida_lib/Cargo.toml @@ -22,6 +22,8 @@ tokio = { version = "1", features = ["full", "signal", "tracing"] } tokio-util = "0.7.12" frida_core = { path = "../frida_core" } frida_client = { path = "../frida_client" } +env_logger = "0.9" +log = "0.4.20" [target.'cfg(target_os="android")'.dependencies] jni = "^0.20" diff --git a/frida_lib/src/lib.rs b/frida_lib/src/lib.rs index 253e7b2..6121b57 100644 --- a/frida_lib/src/lib.rs +++ b/frida_lib/src/lib.rs @@ -8,10 +8,6 @@ use robusta_jni::jni::JNIEnv; use std::fs::File; use std::io::Write; -mod config; -mod client; -mod udp; - static TUN_QUIT: std::sync::Mutex<Option<tokio_util::sync::CancellationToken>> = std::sync::Mutex::new(None); #[bridge] @@ -27,9 +23,9 @@ mod jni { use robusta_jni::jni::errors::Result as JniResult; use robusta_jni::jni::objects::AutoLocal; use robusta_jni::jni::JNIEnv; - use crate::config::ClientConfiguration; - use crate::client::android::AndroidClient; - use crate::client::general::VpnClient; + use frida_core::config::ClientConfiguration; + use frida_client::client::android::AndroidClient; + use frida_client::client::general::VpnClient; use crate::TUN_QUIT; use std::fs::File;