Skip to content

Commit 8e71bac

Browse files
dcharkesCommit Queue
authored andcommitted
[deps] Roll dart-lang/native
Change-Id: Iafb418d4769de9d4fdf000e29de51bfcdef5b67b 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-win-release-arm64-try,pkg-mac-release-try,pkg-win-release-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/420661 Reviewed-by: Devon Carew <[email protected]> Reviewed-by: Moritz Sümmermann <[email protected]>
1 parent ee62e57 commit 8e71bac

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ vars = {
137137
"i18n_rev": "de1943629469719bf34269bf90fcdbe9334a73f3",
138138
"leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually
139139
"material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
140-
"native_rev": "75f3408cd72c1e217f162fb5e43f4cdf1d34e71d", # rolled manually while native assets are experimental
140+
"native_rev": "4928765d7681ad8a4211c5977afd2f93f50b3f65", # rolled manually while native assets are experimental
141141
"protobuf_rev": "1aaa332af75c61ff32739821f7ec52186ff18d4c",
142142
"pub_rev": "b2c03b448a47fdd52800609b9222cd737be3a934", # rolled manually
143143
"shelf_rev": "082d3ac2d13a98700d8148e8fad8f3e12a6fd0e1",

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,10 @@ class BuildCommand extends DartdevCommand {
179179
return 255;
180180
}
181181

182-
final allAssets = linkResult.encodedAssets;
182+
final allAssets = [
183+
...buildResult.encodedAssets,
184+
...linkResult.encodedAssets
185+
];
183186

184187
final staticAssets = allAssets
185188
.where((e) => e.isCodeAsset)

pkg/record_use/test_data/drop_dylib_recording/hook/build.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ void main(List<String> arguments) async {
1313
..onRecord.listen((record) {
1414
print('${record.level.name}: ${record.time}: ${record.message}');
1515
});
16-
final linkInPackage =
17-
input.config.linkingEnabled ? input.packageName : null;
16+
final routing =
17+
input.config.linkingEnabled
18+
? [ToLinkHook(input.packageName)]
19+
: const [ToAppBundle()];
1820
await CBuilder.library(
1921
name: 'add',
2022
assetName: 'dylib_add',
@@ -26,7 +28,7 @@ void main(List<String> arguments) async {
2628
input: input,
2729
output: output,
2830
logger: logger,
29-
linkInPackage: linkInPackage,
31+
routing: routing,
3032
);
3133

3234
await CBuilder.library(
@@ -40,7 +42,7 @@ void main(List<String> arguments) async {
4042
input: input,
4143
output: output,
4244
logger: logger,
43-
linkInPackage: linkInPackage,
45+
routing: routing,
4446
);
4547
});
4648
}

0 commit comments

Comments
 (0)