generate update

.vscode/settings.json

@@ -2,6 +2,7 @@
   "rust-analyzer.cargo.features": "all",
   "rust-analyzer.linkedProjects": ["Cargo.toml"],
   "rust-analyzer.cargo.buildScripts.enable": true,
+  "rust-analyzer.procMacro.enable": true,
   "rust-analyzer.check.command": "check",
   "rust-analyzer.cargo.target": "aarch64-linux-android",
   "rust-analyzer.check.targets": [

Makefile

@@ -18,10 +18,19 @@ debug-server:
 	@echo "--- Запуск сервера локально ---"
 	sudo ./target/debug/netrunner-server --port=4443 --host=0.0.0.0
 
-# Сборка
+
+ABIS = arm64-v8a armeabi-v7a x86_64 x86
+
 build-android:
-	cargo ndk -t arm64-v8a -o ./gen build --bin netrunner-client --release
+	@for abi in $(ABIS); do \
-	cargo run --bin bindgen-tool generate --library gen/arm64-v8a/libnetrunner_client.so --language kotlin --out-dir gen/arm64-v8a
+		echo "Building for $$abi..."; \
+		cargo ndk -t $$abi -o ./gen build --bin netrunner-client --release; \
+		cargo run --bin bindgen-tool generate \
+			--library gen/$$abi/libnetrunner_client.so \
+			--language kotlin \
+			--no-format \
+			--out-dir gen/$$abi; \
+	done
 
 build-server:
 	cargo build --bin netrunner-server --release

client/Cargo.toml

@@ -33,7 +33,7 @@ thiserror = "2.0"
 hickory-proto = "0.25.2"
 lru = "0.16.3"
 tokio-util = "0.7.18"
-uniffi = { version = "0.31.0", features = ["tokio"] }
+uniffi = { version = "0.31.0", features = ["tokio", ] }
 
 [build-dependencies]
 uniffi = { version = "0.31.0", features = ["build"] }

client/build.rs

@@ -1,4 +1,4 @@
 fn main() {
-    println!("cargo:rerun-if-changed=client.udl");
+    println!("cargo:rerun-if-changed=netrunner_client_core.udl");
-    uniffi::generate_scaffolding("./client.udl").expect("Can't generate UniFFI files");
+    uniffi::generate_scaffolding("src/netrunner_client_core.udl").unwrap()
 }

client/src/netrunner_client_core.udl

@@ -1,5 +1,4 @@
-namespace netrunner {
+namespace netrunner_client_core {};
-};
 
 interface SessionManager {
     constructor();