Skip to content

[vector_graphics_compiler] Use Abi.current() for engine-artifact lookup on Linux ARM64 #11781

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

Open
HiroyukiTamura wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

[vector_graphics_compiler] Use Abi.current() for engine-artifact lookup on Linux ARM64 #11781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion packages/vector_graphics_compiler/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## NEXT
## 1.2.4

* Updates minimum supported SDK version to Flutter 3.38/Dart 3.10.
* Fixes `linux-arm64` host support by selecting the Flutter engine
artifact directory from `Abi.current()` instead of a hardcoded
`linux-x64`. The same fix applies to the tessellator loader.
Resolves flutter/flutter#158865.

## 1.2.3

Expand Down
4 changes: 3 additions & 1 deletion packages/vector_graphics_compiler/lib/src/_initialize_path_ops_io.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

// ignore_for_file: avoid_print

import 'dart:ffi' show Abi;
import 'dart:io';

import 'svg/path_ops.dart';

/// Look up the location of the pathops from flutter's artifact cache.
Expand All @@ -28,7 +30,7 @@ bool initializePathOpsFromFlutterCache() {
platform = 'darwin-x64';
executable = 'libpath_ops.dylib';
} else if (Platform.isLinux) {
platform = 'linux-x64';
platform = Abi.current() == Abi.linuxArm64 ? 'linux-arm64' : 'linux-x64';
executable = 'libpath_ops.so';
} else {
print('path_ops not supported on ${Platform.localeName}');
Expand Down
4 changes: 3 additions & 1 deletion packages/vector_graphics_compiler/lib/src/_initialize_tessellator_io.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

// ignore_for_file: avoid_print

import 'dart:ffi' show Abi;
import 'dart:io';

import 'svg/tessellator.dart';

/// Look up the location of the tessellator from flutter's artifact cache.
Expand All @@ -28,7 +30,7 @@ bool initializeTessellatorFromFlutterCache() {
platform = 'darwin-x64';
executable = 'libtessellator.dylib';
} else if (Platform.isLinux) {
platform = 'linux-x64';
platform = Abi.current() == Abi.linuxArm64 ? 'linux-arm64' : 'linux-x64';
executable = 'libtessellator.so';
} else {
print('Tesselation not supported on ${Platform.localeName}');
Expand Down
2 changes: 1 addition & 1 deletion packages/vector_graphics_compiler/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: vector_graphics_compiler
description: A compiler to convert SVGs to the binary format used by `package:vector_graphics`.
repository: https://github.com/flutter/packages/tree/main/packages/vector_graphics_compiler
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+vector_graphics%22
version: 1.2.3
version: 1.2.4

executables:
vector_graphics_compiler:
Expand Down