diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 6b0a4971f..aead1af1b 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -426,11 +426,6 @@ jobs: prefix-key: rustdesk-lib-cache key: ${{ matrix.job.target }}-${{ matrix.job.extra-build-features }} - - name: Disable rust bridge build - shell: bash - run: | - sed -i build.rs.bak "s/gen_flutter_rust_bridge();/\/\//g" build.rs - - name: Build rustdesk lib env: VCPKG_ROOT: /opt/rustdesk_thirdparty_lib/vcpkg @@ -525,10 +520,6 @@ jobs: prefix-key: rustdesk-lib-cache key: ${{ matrix.job.target }}-${{ matrix.job.extra-build-features }} - - name: Disable rust bridge build - run: | - sed -i "s/gen_flutter_rust_bridge();/\/\//g" build.rs - - name: Build rustdesk lib env: ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} @@ -706,7 +697,6 @@ jobs: - name: Disable rust bridge build run: | - sed -i "s/gen_flutter_rust_bridge();/\/\//g" build.rs # only build cdylib sed -i "s/\[\"cdylib\", \"staticlib\", \"rlib\"\]/\[\"cdylib\"\]/g" Cargo.toml @@ -877,7 +867,6 @@ jobs: - name: Disable rust bridge build run: | - sed -i "s/gen_flutter_rust_bridge();/\/\//g" build.rs # only build cdylib sed -i "s/\[\"cdylib\", \"staticlib\", \"rlib\"\]/\[\"cdylib\"\]/g" Cargo.toml diff --git a/build.rs b/build.rs index cbf01a142..8db0adf77 100644 --- a/build.rs +++ b/build.rs @@ -78,7 +78,7 @@ fn install_oboe() { #[cfg(feature = "flutter")] fn gen_flutter_rust_bridge() { - if std::env::var("IGNORE_FFIGEN").is_ok() { + if std::env::var("RUN_FFIGEN").is_ok() { return; } use lib_flutter_rust_bridge_codegen::{ diff --git a/flutter/run.sh b/flutter/run.sh index 78fd1e80c..bfda48431 100755 --- a/flutter/run.sh +++ b/flutter/run.sh @@ -4,5 +4,5 @@ dart pub global activate ffigen --version 5.0.1 flutter pub get # call `flutter clean` if cargo build fails # export LLVM_HOME=/Library/Developer/CommandLineTools/usr/ -cargo build --features "flutter,flutter_texture_render" +RUN_FFIGEN=Y cargo build --features "flutter,flutter_texture_render" flutter run $@