Skip to content

Commit c2abea3

Browse files
dcharkesCommit Queue
authored andcommitted
[deps] Roll dart-lang/native
Change-Id: I3fc1f2be91d1bbbe1af8b9c4585671db8e86efea 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/+/400300 Reviewed-by: Martin Kustermann <[email protected]> Commit-Queue: Daco Harkes <[email protected]>
1 parent 3b056e1 commit c2abea3

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ vars = {
143143
"markdown_rev": "4d5dbc659955973902f2585c54e94d453532db70",
144144
"material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
145145
# dart-native-interop-team@ is rolling breaking changes manually while the assets features are in experimental.
146-
"native_rev": "da5dc148a0430b6c4224b59178db5385d79b2298", # disable tools/rev_sdk_deps.dart
146+
"native_rev": "4d81ce6c5e17164ef63d8a3f5144e5def0702207", # disable tools/rev_sdk_deps.dart
147147
"package_config_rev": "76f2f6c245451da1fa24d7bbb00251b909e729a5",
148148
"pool_rev": "f85209d83cb0aa3c5612ed80de32df51ba580abd",
149149
"protobuf_rev": "da7279c56734cffed4deb1e3a6f93bdcefccf6b8",

pkg/dartdev/lib/src/commands/build.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ class BuildCommand extends DartdevCommand {
146146
final buildResult = await nativeAssetsBuildRunner.build(
147147
configCreator: () => BuildConfigBuilder()
148148
..setupCodeConfig(
149+
targetOS: target.os,
149150
linkModePreference: LinkModePreference.dynamic,
150151
targetArchitecture: target.architecture,
151152
targetMacOSVersion: targetMacOSVersion,
@@ -156,8 +157,7 @@ class BuildCommand extends DartdevCommand {
156157
...await validateCodeAssetBuildConfig(config),
157158
],
158159
workingDirectory: workingDirectory,
159-
targetOS: target.os,
160-
buildMode: BuildMode.release,
160+
161161
linkingEnabled: true,
162162
buildAssetTypes: [
163163
CodeAsset.type,
@@ -204,6 +204,7 @@ class BuildCommand extends DartdevCommand {
204204
final linkResult = await nativeAssetsBuildRunner.link(
205205
configCreator: () => LinkConfigBuilder()
206206
..setupCodeConfig(
207+
targetOS: target.os,
207208
targetArchitecture: target.architecture,
208209
linkModePreference: LinkModePreference.dynamic,
209210
targetMacOSVersion: targetMacOSVersion,
@@ -216,8 +217,8 @@ class BuildCommand extends DartdevCommand {
216217
resourceIdentifiers:
217218
recordUseEnabled ? Uri.file(recordedUsagesPath!) : null,
218219
workingDirectory: workingDirectory,
219-
targetOS: target.os,
220-
buildMode: BuildMode.release,
220+
221+
221222
buildResult: buildResult,
222223
buildAssetTypes: [
223224
CodeAsset.type,

pkg/dartdev/lib/src/native_assets.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ Future<List<EncodedAsset>?> compileNativeAssetsJit({
5353
final buildResult = await nativeAssetsBuildRunner.build(
5454
configCreator: () => BuildConfigBuilder()
5555
..setupCodeConfig(
56+
targetOS: target.os,
5657
targetArchitecture: target.architecture,
5758
// When running in JIT mode, only dynamic libraries are supported.
5859
linkModePreference: LinkModePreference.dynamic,
@@ -64,9 +65,6 @@ Future<List<EncodedAsset>?> compileNativeAssetsJit({
6465
...await validateDataAssetBuildConfig(config),
6566
],
6667
workingDirectory: workingDirectory,
67-
targetOS: target.os,
68-
// Dart has no concept of release vs debug, default to release.
69-
buildMode: BuildMode.release,
7068
runPackageName: runPackageName,
7169
linkingEnabled: false,
7270
buildAssetTypes: [

0 commit comments

Comments
 (0)