Skip to content

fix: improve backend matching logic to handle multiple matches #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anhappdev merged 6 commits into from
Jan 7, 2026
Merged

fix: improve backend matching logic to handle multiple matches #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b54218
fix: improve backend matching logic to handle multiple matches and up…
anhappdev Dec 16, 2025
af9e2eb
fix: adjust dependencies for unified extended Android tests in CI con…
anhappdev Dec 17, 2025
9fd10dc
fix: enhance backend matching logic to include fallback backend option
anhappdev Dec 17, 2025
fd745bd
fix: add unified test dependency and log matched backend in list.dart
anhappdev Dec 17, 2025
e036aa8
fix: log matched backend path in backend match function
anhappdev Dec 17, 2025
b6af281
Merge branch 'master' into anh/improve-backend-matches
anhappdev Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flutter/cpp/flutter/dart_backend_match.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ extern "C" struct dart_ffi_backend_match_result *dart_ffi_backend_match(
result->pbdata = new char[result->pbdata_size];
memcpy(result->pbdata, res.data(), result->pbdata_size);

LOG(INFO) << "backend matches";
LOG(INFO) << "backend matches '" << lib_path << "'";

return result;
}
Expand Down
24 changes: 22 additions & 2 deletions flutter/lib/backend/list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,33 @@ part 'list.gen.dart';

class BackendInfoHelper {
BackendInfo findMatching() {
const fallbackBackend = 'libtflitebackend';
final matches = <BackendInfo>[];
// Try to match all backends except the fallback
for (var name in getBackendsList()) {
if (name == fallbackBackend) continue;
print('Checking $name');
final backendSettings = match(name);
if (backendSettings != null) {
return BackendInfo._(backendSettings, name);
matches.add(BackendInfo._(backendSettings, name));
}
}
throw 'no matching backend found';

if (matches.isEmpty) {
// No specific backend matched, use fallback
print('Checking $fallbackBackend');
final backendSettings = match(fallbackBackend);
if (backendSettings != null) {
return BackendInfo._(backendSettings, fallbackBackend);
}
throw 'no matching backend found';
}
if (matches.length > 1) {
final names = matches.map((m) => m.libName).join(', ');
throw 'multiple matching backends found: $names';
}
print('Using backend: ${matches.single.libName}');
return matches.single;
}

pb.BackendSetting? match(String libName) {
Expand Down
Loading