From 5ad0730a26cc77e79733a5042bb257a55094c0b7 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Tue, 31 Oct 2023 11:00:13 +0800 Subject: [PATCH] remove gen_flutter_rust_bridge in build.rs --- Cargo.toml | 1 - build.rs | 40 ---------------------------------------- 2 files changed, 41 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 52d77211f..95191520b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -164,7 +164,6 @@ winapi = { version = "0.3", features = [ "winnt" ] } [build-dependencies] cc = "1.0" hbb_common = { path = "libs/hbb_common" } -flutter_rust_bridge_codegen = "=1.75" os-version = "0.2" [dev-dependencies] diff --git a/build.rs b/build.rs index 054eb3700..ad745667d 100644 --- a/build.rs +++ b/build.rs @@ -76,52 +76,12 @@ fn install_oboe() { //cc::Build::new().file("oboe.cc").include(include).compile("oboe_wrapper"); } -#[cfg(feature = "flutter")] -fn gen_flutter_rust_bridge() { - if !std::env::var("RUN_FFIGEN").is_ok() { - return; - } - use lib_flutter_rust_bridge_codegen::{ - config_parse, frb_codegen, get_symbols_if_no_duplicates, RawOpts, - }; - let llvm_path = match std::env::var("LLVM_HOME") { - Ok(path) => Some(vec![path]), - Err(_) => None, - }; - // Tell Cargo that if the given file changes, to rerun this build script. - println!("cargo:rerun-if-changed=src/flutter_ffi.rs"); - // Options for frb_codegen - let raw_opts = RawOpts { - // Path of input Rust code - rust_input: vec!["src/flutter_ffi.rs".to_string()], - // Path of output generated Dart code - dart_output: vec!["flutter/lib/generated_bridge.dart".to_string()], - // Path of output generated C header - c_output: Some(vec!["flutter/macos/Runner/bridge_generated.h".to_string()]), - /// Path to the installed LLVM - llvm_path, - // for other options use defaults - ..Default::default() - }; - // get opts from raw opts - let configs = config_parse(raw_opts); - // generation of rust api for ffi - let all_symbols = get_symbols_if_no_duplicates(&configs).unwrap(); - for config in configs.iter() { - frb_codegen(config, &all_symbols).unwrap(); - } -} - fn main() { hbb_common::gen_version(); install_oboe(); // there is problem with cfg(target_os) in build.rs, so use our workaround // let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap(); // if target_os == "android" || target_os == "ios" { - #[cfg(feature = "flutter")] - gen_flutter_rust_bridge(); - // return; - // } #[cfg(all(windows, feature = "inline"))] build_manifest(); #[cfg(windows)]