From b6207ebdb4c5105fbd3977222f91e91c4b299a63 Mon Sep 17 00:00:00 2001 From: Daco Harkes Date: Thu, 16 May 2024 17:12:17 +0000 Subject: [PATCH] [deps] Roll dart-lang/native Adds the missing argument to `link`. Change-Id: I8a9d167b046ac301e5274a5062e30d6c186ac257 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/+/366381 Reviewed-by: Hossein Yousefi Commit-Queue: Hossein Yousefi Auto-Submit: Daco Harkes Commit-Queue: Daco Harkes --- DEPS | 2 +- pkg/dartdev/lib/src/commands/build.dart | 1 + pkg/dartdev/lib/src/native_assets.dart | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 3761eca3abb..eafafbcdfbf 100644 --- a/DEPS +++ b/DEPS @@ -164,7 +164,7 @@ vars = { "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e", "mime_rev": "b01c9a24e0991da479bd405138be3b3e403ff456", "mockito_rev": "4be52e16d06c8c5384d1cf5a511f0c9a7d829cf7", - "native_rev": "7bca3567228c259dd5cc8e8530cd1585d8de42a0", # mosum@ and dacoharkes@ are rolling breaking changes manually while the assets features are in experimental. + "native_rev": "fef40aebc3cf34654919e8a5785b6c50b3ea445c", # mosum@ and dacoharkes@ are rolling breaking changes manually while the assets features are in experimental. "package_config_rev": "39096768806ccae4b7025dd4114f15f2df424b0c", "path_rev": "9be79e72be7837fd8b99ae51a69f4c9f04ec29b4", "pool_rev": "1a6f2df19d7a24baaf674e032a0310a4f76725de", diff --git a/pkg/dartdev/lib/src/commands/build.dart b/pkg/dartdev/lib/src/commands/build.dart index 5fcf734f42f..cb37351e78d 100644 --- a/pkg/dartdev/lib/src/commands/build.dart +++ b/pkg/dartdev/lib/src/commands/build.dart @@ -175,6 +175,7 @@ class BuildCommand extends DartdevCommand { resourceIdentifiers: Uri.file(resources), workingDirectory: workingDirectory, target: target, + linkModePreference: LinkModePreferenceImpl.dynamic, buildMode: BuildModeImpl.release, includeParentEnvironment: true, buildResult: buildResult, diff --git a/pkg/dartdev/lib/src/native_assets.dart b/pkg/dartdev/lib/src/native_assets.dart index 6d47db877a8..704550e2fc4 100644 --- a/pkg/dartdev/lib/src/native_assets.dart +++ b/pkg/dartdev/lib/src/native_assets.dart @@ -52,7 +52,11 @@ Future<(bool success, List assets)> compileNativeAssetsJit({ final linkResult = await nativeAssetsBuildRunner.link( workingDirectory: workingDirectory, + // When running in JIT mode, only the host OS needs to be build. target: Target.current, + // When running in JIT mode, only dynamic libraries are supported. + linkModePreference: LinkModePreferenceImpl.dynamic, + // Dart has no concept of release vs debug, default to release. buildMode: BuildModeImpl.release, includeParentEnvironment: true, buildResult: buildResult,