From be86b2861033509f877ed902b351a6f8c46256dd Mon Sep 17 00:00:00 2001 From: Moritz Date: Fri, 19 Jul 2024 11:59:31 +0200 Subject: [PATCH] Small changes --- .../native_assets_cli/lib/src/api/builder.dart | 13 ------------- .../test/clinker/objects_test.dart | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/pkgs/native_assets_cli/lib/src/api/builder.dart b/pkgs/native_assets_cli/lib/src/api/builder.dart index df39d219f4..11b8a6d18f 100644 --- a/pkgs/native_assets_cli/lib/src/api/builder.dart +++ b/pkgs/native_assets_cli/lib/src/api/builder.dart @@ -4,7 +4,6 @@ import 'package:logging/logging.dart'; -import '../../native_assets_cli.dart'; import 'build_config.dart'; import 'build_output.dart'; import 'linker.dart'; @@ -76,15 +75,3 @@ abstract interface class Builder { required Logger? logger, }); } - -abstract interface class Linker { - /// Runs this link. - /// - /// Reads the config from [config], streams output to [output], and streams - /// logs to [logger]. - Future run({ - required LinkConfig config, - required LinkOutput output, - required Logger? logger, - }); -} diff --git a/pkgs/native_toolchain_c/test/clinker/objects_test.dart b/pkgs/native_toolchain_c/test/clinker/objects_test.dart index 1015321d2c..10d495918a 100644 --- a/pkgs/native_toolchain_c/test/clinker/objects_test.dart +++ b/pkgs/native_toolchain_c/test/clinker/objects_test.dart @@ -42,14 +42,16 @@ Future main() async { cCompiler: cCompilerConfig, assets: []); await CLinker.library( - name: name, - assetName: 'testassetname', - linkerOptions: LinkerOptions.manual(gcSections: false), - sources: [ - 'test/clinker/testfiles/linker/test1.o', - 'test/clinker/testfiles/linker/test2.o', - ].map((e) => packageUri.resolve(e).toFilePath()).toList()) - .run( + name: name, + assetName: 'testassetname', + linkerOptions: LinkerOptions.manual(gcSections: false), + sources: [ + 'test/clinker/testfiles/linker/test1.o', + 'test/clinker/testfiles/linker/test2.o', + ] + .map((objectFile) => packageUri.resolve(objectFile).toFilePath()) + .toList(), + ).run( config: linkConfig, output: linkOutput, logger: logger,