From 589f5c1298d7893b6f2eabb602916676cdc556e5 Mon Sep 17 00:00:00 2001 From: "Lucas.Xu" Date: Wed, 4 Sep 2024 16:55:49 +0800 Subject: [PATCH] feat: exclude ARMv7 architecture for Android builds (#6187) --- frontend/appflowy_flutter/android/app/build.gradle | 7 +++++++ .../mobile_toolbar_v3/appflowy_mobile_toolbar_item.dart | 2 +- frontend/scripts/makefile/mobile.toml | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frontend/appflowy_flutter/android/app/build.gradle b/frontend/appflowy_flutter/android/app/build.gradle index fe788cbb52..35dcadda87 100644 --- a/frontend/appflowy_flutter/android/app/build.gradle +++ b/frontend/appflowy_flutter/android/app/build.gradle @@ -87,6 +87,13 @@ android { path "src/main/CMakeLists.txt" } } + + // only support arm64-v8a + defaultConfig { + ndk { + abiFilters "arm64-v8a" + } + } } flutter { diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mobile_toolbar_v3/appflowy_mobile_toolbar_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mobile_toolbar_v3/appflowy_mobile_toolbar_item.dart index 014889261f..12e7d1bef7 100644 --- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mobile_toolbar_v3/appflowy_mobile_toolbar_item.dart +++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mobile_toolbar_v3/appflowy_mobile_toolbar_item.dart @@ -135,7 +135,7 @@ class _AppFlowyMobileToolbarIconItemState } void _rebuild() { - if (!context.mounted) { + if (!mounted) { return; } setState(() { diff --git a/frontend/scripts/makefile/mobile.toml b/frontend/scripts/makefile/mobile.toml index d466a71961..56329a2936 100644 --- a/frontend/scripts/makefile/mobile.toml +++ b/frontend/scripts/makefile/mobile.toml @@ -67,10 +67,10 @@ script = [ cd rust-lib/ if [ "${BUILD_FLAG}" = "debug" ]; then echo "🚀 🚀 🚀 Building Android SDK for debug" - cargo ndk -t arm64-v8a -t armeabi-v7a -o ./jniLibs build --features "${FLUTTER_DESKTOP_FEATURES}" --package=dart-ffi + cargo ndk -t arm64-v8a -o ./jniLibs build --features "${FLUTTER_DESKTOP_FEATURES}" --package=dart-ffi else echo "🚀 🚀 🚀 Building Android SDK for release" - cargo ndk -t arm64-v8a -t armeabi-v7a -o ./jniLibs build --features "${FLUTTER_DESKTOP_FEATURES}" --package=dart-ffi --release + cargo ndk -t arm64-v8a -o ./jniLibs build --features "${FLUTTER_DESKTOP_FEATURES}" --package=dart-ffi --release fi cd ../ """,