Skip to content

Commit da5ae47

Browse files
dcharkesCommit Queue
authored andcommitted
[deps] Roll dart-lang/native
Adds support for dev dependencies with build hooks in `dart test`. TEST=pkg/dartdev/test/native_assets/test_test.dart Change-Id: Ia05497ef5e1ec2bf11454fde8660b6626dcc524e 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/+/432621 Reviewed-by: Michael Goderbauer <[email protected]> Commit-Queue: Michael Goderbauer <[email protected]> Commit-Queue: Daco Harkes <[email protected]> Auto-Submit: Daco Harkes <[email protected]>
1 parent 4e84425 commit da5ae47

File tree

8 files changed

+11
-2
lines changed

8 files changed

+11
-2
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ vars = {
138138
"i18n_rev": "e44af5483a051d546716b6aa3a57e478c59a5d8d",
139139
"leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually
140140
"material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
141-
"native_rev": "09a756cb8d89638c1179efc86b51156282f5e856", # rolled manually while native assets are experimental
141+
"native_rev": "7f5bfa6973becbb0b4d6ecc34f41f9cdc5701d83", # rolled manually while native assets are experimental
142142
"protobuf_rev": "c69077d83ce5a66d21127019f45b81bcd1e777c4",
143143
"pub_rev": "818f10b4bf9249bd0b2c212dd8709675eeb14cd2", # rolled manually
144144
"shelf_rev": "082d3ac2d13a98700d8148e8fad8f3e12a6fd0e1",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ See documentation on https://dart.dev/interop/c-interop#native-assets.
150150
packageConfigUri: packageConfigUri,
151151
packageConfig: packageConfig,
152152
runPackageName: runPackageName!,
153+
includeDevDependencies: false,
153154
verbose: verbose,
154155
);
155156
final buildResult = await builder.buildNativeAssetsAOT();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,7 @@ Remove debugging information from the output and save it separately to the speci
630630
packageConfigUri: packageConfigUri,
631631
packageConfig: packageConfig,
632632
runPackageName: runPackageName,
633+
includeDevDependencies: false,
633634
verbose: verbose,
634635
target: target);
635636
if (!nativeAssetsExperimentEnabled) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ class RunCommand extends DartdevCommand {
413413
packageConfigUri: packageConfigUri,
414414
packageConfig: packageConfig,
415415
runPackageName: runPackageName,
416+
includeDevDependencies: false,
416417
verbose: verbose,
417418
);
418419
if (!nativeAssetsExperimentEnabled) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Run "${runner!.executableName} help" to see global options.''');
6767
packageConfigUri: packageConfigUri,
6868
packageConfig: packageConfig,
6969
runPackageName: runPackageName,
70+
includeDevDependencies: true,
7071
verbose: verbose,
7172
);
7273
if (!nativeAssetsExperimentEnabled) {

pkg/dartdev/lib/src/native_assets.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class DartNativeAssetsBuilder {
2424
final Uri packageConfigUri;
2525
final package_config.PackageConfig packageConfig;
2626
final String runPackageName;
27+
final bool includeDevDependencies;
2728
final bool verbose;
2829

2930
static const _fileSystem = LocalFileSystem();
@@ -34,6 +35,7 @@ class DartNativeAssetsBuilder {
3435
packageConfig,
3536
packageConfigUri,
3637
runPackageName,
38+
includeDevDependencies: includeDevDependencies,
3739
);
3840
}();
3941

@@ -68,6 +70,7 @@ class DartNativeAssetsBuilder {
6870
required this.packageConfigUri,
6971
required this.packageConfig,
7072
required this.runPackageName,
73+
required this.includeDevDependencies,
7174
required this.verbose,
7275
Target? target,
7376
}) : target = target ?? Target.current;

pkg/dartdev/test/native_assets/helpers.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ Future<void> nativeAssetsTest(
254254
const [
255255
'add_asset_link',
256256
'dart_app',
257+
'dev_dependency_with_hook',
257258
'drop_dylib_link',
258259
'native_add_duplicate',
259260
'native_add_version_skew',

pkg/dartdev/test/native_assets/test_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ void main([List<String> args = const []]) async {
1818
// stdout.
1919

2020
for (final package in [
21-
'native_add',
21+
'dev_dependency_with_hook',
2222
'native_add_version_skew',
23+
'native_add',
2324
'native_dynamic_linking',
2425
'system_library',
2526
]) {

0 commit comments

Comments
 (0)