From 9b631bf33362be3bf359896fb4b1aa58a12ea602 Mon Sep 17 00:00:00 2001 From: Liam Appelbe Date: Wed, 8 Jan 2025 20:05:37 -0800 Subject: [PATCH] [deps] Roll dart-lang/native Change-Id: I4a37c01fefdf00e128b7b2716ac893b3aed10171 Cq-Include-Trybots: luci.dart.try:pkg-linux-debug-try,pkg-linux-release-arm64-try,pkg-linux-release-try,pkg-mac-release-arm64-try,pkg-mac-release-try,pkg-win-release-arm64-try,pkg-win-release-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/403585 Reviewed-by: Liam Appelbe Reviewed-by: Brian Quinlan Reviewed-by: Nate Bosch Commit-Queue: Liam Appelbe --- DEPS | 2 +- pkg/dartdev/lib/src/commands/build.dart | 28 +++++++++---------- pkg/dartdev/lib/src/native_assets.dart | 14 +++++----- .../drop_dylib_recording/hook/build.dart | 9 +++--- .../drop_dylib_recording/hook/link.dart | 12 ++++---- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/DEPS b/DEPS index f89f933031a..536a0fe9136 100644 --- a/DEPS +++ b/DEPS @@ -141,7 +141,7 @@ vars = { "markdown_rev": "19aaded4300d24bedcbf52ade792b203ddf030b0", "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e", # dart-native-interop-team@ is rolling breaking changes manually while the assets features are in experimental. - "native_rev": "0f9cb0bea17cdd39bacc498e36d687d6baddd0a3", # disable tools/rev_sdk_deps.dart + "native_rev": "14368a80bae9e3f381a2e59c91405338d82451ee", # disable tools/rev_sdk_deps.dart "package_config_rev": "07097d7ae60d40b34ce8daabdce318ecc168b7d1", "pool_rev": "bf27900420ba382b6e5c0484ab3c79daad703dcd", "protobuf_rev": "b7dd58cdbd879beee4c3fbf8ee80fce8e97bad26", diff --git a/pkg/dartdev/lib/src/commands/build.dart b/pkg/dartdev/lib/src/commands/build.dart index 2747b99aff0..c7b95313d49 100644 --- a/pkg/dartdev/lib/src/commands/build.dart +++ b/pkg/dartdev/lib/src/commands/build.dart @@ -147,17 +147,17 @@ class BuildCommand extends DartdevCommand { final cCompilerConfig = getCCompilerConfig(); final buildResult = await nativeAssetsBuildRunner.build( - configCreator: () => BuildConfigBuilder() - ..setupCodeConfig( + inputCreator: () => BuildInputBuilder() + ..config.setupCode( targetOS: target.os, linkModePreference: LinkModePreference.dynamic, targetArchitecture: target.architecture, - macOSConfig: macOSConfig, - cCompilerConfig: cCompilerConfig, + macOS: macOSConfig, + cCompiler: cCompilerConfig, ), - configValidator: (config) async => [ - ...await validateDataAssetBuildConfig(config), - ...await validateCodeAssetBuildConfig(config), + inputValidator: (config) async => [ + ...await validateDataAssetBuildInput(config), + ...await validateCodeAssetBuildInput(config), ], workingDirectory: workingDirectory, @@ -205,17 +205,17 @@ class BuildCommand extends DartdevCommand { // Start linking here. final linkResult = await nativeAssetsBuildRunner.link( - configCreator: () => LinkConfigBuilder() - ..setupCodeConfig( + inputCreator: () => LinkInputBuilder() + ..config.setupCode( targetOS: target.os, targetArchitecture: target.architecture, linkModePreference: LinkModePreference.dynamic, - macOSConfig: macOSConfig, - cCompilerConfig: cCompilerConfig, + macOS: macOSConfig, + cCompiler: cCompilerConfig, ), - configValidator: (config) async => [ - ...await validateDataAssetLinkConfig(config), - ...await validateCodeAssetLinkConfig(config), + inputValidator: (config) async => [ + ...await validateDataAssetLinkInput(config), + ...await validateCodeAssetLinkInput(config), ], resourceIdentifiers: recordUseEnabled ? Uri.file(recordedUsagesPath!) : null, diff --git a/pkg/dartdev/lib/src/native_assets.dart b/pkg/dartdev/lib/src/native_assets.dart index b5200304f20..d7bf04d2d89 100644 --- a/pkg/dartdev/lib/src/native_assets.dart +++ b/pkg/dartdev/lib/src/native_assets.dart @@ -54,18 +54,18 @@ Future?> compileNativeAssetsJit({ : null; final cCompilerConfig = getCCompilerConfig(); final buildResult = await nativeAssetsBuildRunner.build( - configCreator: () => BuildConfigBuilder() - ..setupCodeConfig( + inputCreator: () => BuildInputBuilder() + ..config.setupCode( targetOS: target.os, targetArchitecture: target.architecture, // When running in JIT mode, only dynamic libraries are supported. linkModePreference: LinkModePreference.dynamic, - macOSConfig: macOSConfig, - cCompilerConfig: cCompilerConfig, + macOS: macOSConfig, + cCompiler: cCompilerConfig, ), - configValidator: (config) async => [ - ...await validateCodeAssetBuildConfig(config), - ...await validateDataAssetBuildConfig(config), + inputValidator: (config) async => [ + ...await validateCodeAssetBuildInput(config), + ...await validateDataAssetBuildInput(config), ], workingDirectory: workingDirectory, runPackageName: runPackageName, diff --git a/pkg/record_use/test_data/drop_dylib_recording/hook/build.dart b/pkg/record_use/test_data/drop_dylib_recording/hook/build.dart index a924a9ee8f1..10fa73f455c 100644 --- a/pkg/record_use/test_data/drop_dylib_recording/hook/build.dart +++ b/pkg/record_use/test_data/drop_dylib_recording/hook/build.dart @@ -7,13 +7,14 @@ import 'package:native_assets_cli/code_assets.dart'; import 'package:native_toolchain_c/native_toolchain_c.dart'; void main(List arguments) async { - await build(arguments, (config, output) async { + await build(arguments, (input, output) async { final logger = Logger('') ..level = Level.ALL ..onRecord.listen((record) { print('${record.level.name}: ${record.time}: ${record.message}'); }); - final linkInPackage = config.linkingEnabled ? config.packageName : null; + final linkInPackage = + input.config.linkingEnabled ? input.packageName : null; await CBuilder.library( name: 'add', assetName: 'dylib_add', @@ -22,7 +23,7 @@ void main(List arguments) async { ], linkModePreference: LinkModePreference.dynamic, ).run( - config: config, + input: input, output: output, logger: logger, linkInPackage: linkInPackage, @@ -36,7 +37,7 @@ void main(List arguments) async { ], linkModePreference: LinkModePreference.dynamic, ).run( - config: config, + input: input, output: output, logger: logger, linkInPackage: linkInPackage, diff --git a/pkg/record_use/test_data/drop_dylib_recording/hook/link.dart b/pkg/record_use/test_data/drop_dylib_recording/hook/link.dart index 735133f5430..8f3dbc290ff 100644 --- a/pkg/record_use/test_data/drop_dylib_recording/hook/link.dart +++ b/pkg/record_use/test_data/drop_dylib_recording/hook/link.dart @@ -26,18 +26,18 @@ final instanceId = const Identifier( ); void main(List arguments) async { - await link(arguments, (config, output) async { - final file = File.fromUri(config.recordedUsagesFile!); + await link(arguments, (input, output) async { + final file = File.fromUri(input.recordedUsagesFile!); final string = await file.readAsString(); final usages = RecordedUsages.fromJson(jsonDecode(string) as Map); - final codeAssets = config.codeAssets; + final codeAssets = input.assets.code; print('Received assets: ${codeAssets.map((a) => a.id).join(', ')}.'); final symbols = {}; final argumentsFile = - await File.fromUri(config.outputDirectory.resolve('arguments.txt')) + await File.fromUri(input.outputDirectory.resolve('arguments.txt')) .create(); final dataLines = []; @@ -71,8 +71,8 @@ void main(List arguments) async { ]; print('Keeping only ${neededCodeAssets.map((e) => e.id).join(', ')}.'); - output.codeAssets.addAll(neededCodeAssets); + output.assets.code.addAll(neededCodeAssets); - output.addDependency(config.packageRoot.resolve('hook/link.dart')); + output.addDependency(input.packageRoot.resolve('hook/link.dart')); }); }