Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions packages/flutter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## Unreleased

- Fix Flutter iOS simulator native-asset packaging by emitting an
architecture-specific dylib for each simulator target.

## 0.9.85

- Initial release.
Expand Down
57 changes: 53 additions & 4 deletions packages/flutter/hook/build.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ void main(List<String> args) async {

final binaryPath = _resolveBinaryPath(os, arch, codeConfig);
if (binaryPath == null) {
throw UnsupportedError(
'sqlite_vector does not support $os $arch.',
);
throw UnsupportedError('sqlite_vector does not support $os $arch.');
}

final nativeLibDir = p.join(
Expand All @@ -34,17 +32,68 @@ void main(List<String> args) async {
);
}

output.dependencies.add(file.uri);

final assetFile = await _prepareAssetFile(
input: input,
os: os,
arch: arch,
config: codeConfig,
file: file,
);

output.assets.code.add(
CodeAsset(
package: input.packageName,
name: 'src/native/sqlite_vector_extension.dart',
linkMode: DynamicLoadingBundled(),
file: file.uri,
file: assetFile.uri,
),
);
});
}

Future<File> _prepareAssetFile({
required BuildInput input,
required OS os,
required Architecture arch,
required CodeConfig config,
required File file,
}) async {
if (os != OS.iOS || config.iOS.targetSdk == IOSSdk.iPhoneOS) {
return file;
}

final thinArch = switch (arch) {
Architecture.arm64 => 'arm64',
Architecture.x64 => 'x86_64',
_ => null,
};
if (thinArch == null) {
return file;
}

final outputName = 'vector_ios_sim_$thinArch.dylib';
final outputFile = File.fromUri(input.outputDirectory.resolve(outputName));
await outputFile.parent.create(recursive: true);

final result = await Process.run('/usr/bin/lipo', [
file.path,
'-thin',
thinArch,
'-output',
outputFile.path,
]);
if (result.exitCode != 0) {
throw StateError(
'Failed to thin sqlite_vector iOS simulator binary for $thinArch: '
'${result.stderr}',
);
}

return outputFile;
}

String? _resolveBinaryPath(OS os, Architecture arch, CodeConfig config) {
if (os == OS.android) {
return switch (arch) {
Expand Down