[deps] Roll dart-lang/native

dcharkes · Commit Queue · commit 245498232cdb · 2025-05-01T02:18:11.000-07:00
`package:native_assets_cli` has been split up and `package:native_assets_builder` has been renamed. Change-Id: Ic9d5c21bb3c7ecf7924fdee6b4281153ad37fac5 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/+/425504 Reviewed-by: Ivan Inozemtsev <iinozemtsev@google.com> Commit-Queue: Daco Harkes <dacoharkes@google.com>
diff --git a/.gitignore b/.gitignore
@@ -79,6 +79,7 @@ packages
 pubspec.lock
 
 # Files for native assets auto-generated per checkout.
+/.dart_tool/hooks_runner/
 /.dart_tool/native_assets_builder/
 
 # Files generated by pub and other dart tools.
diff --git a/DEPS b/DEPS
@@ -138,7 +138,7 @@ vars = {
   "i18n_rev": "de1943629469719bf34269bf90fcdbe9334a73f3",
   "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
-  "native_rev": "625ed307c45925b4e216250745b15907bfa237ff", # rolled manually while native assets are experimental
+  "native_rev": "b324678c5a469e933f30693e5648947d5bfd5e9e", # rolled manually while native assets are experimental
   "protobuf_rev": "1aaa332af75c61ff32739821f7ec52186ff18d4c",
   "pub_rev": "b2c03b448a47fdd52800609b9222cd737be3a934", # rolled manually
   "shelf_rev": "082d3ac2d13a98700d8148e8fad8f3e12a6fd0e1",
diff --git a/pkg/dart2native/lib/dart2native.dart b/pkg/dart2native/lib/dart2native.dart
@@ -5,9 +5,9 @@
 import 'dart:io';
 import 'dart:typed_data';
 
+import 'package:code_assets/code_assets.dart' show OS;
 import 'package:collection/collection.dart';
 import 'package:kernel/binary/tag.dart' show Tag;
-import 'package:native_assets_cli/code_assets.dart' show OS;
 import 'package:path/path.dart' as path;
 
 import 'dart2native_macho.dart' show writeAppendedMachOExecutable;
diff --git a/pkg/dart2native/lib/generate.dart b/pkg/dart2native/lib/generate.dart
@@ -4,7 +4,7 @@
 
 import 'dart:io';
 
-import 'package:native_assets_cli/code_assets.dart' show OS;
+import 'package:code_assets/code_assets.dart' show OS;
 import 'package:path/path.dart' as path;
 
 import 'dart2native.dart';
diff --git a/pkg/dart2native/pubspec.yaml b/pkg/dart2native/pubspec.yaml
@@ -13,9 +13,9 @@ executables:
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
+  code_assets: any
   collection: any
   kernel: any
-  native_assets_cli: any
   path: any
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
diff --git a/pkg/dartdev/lib/src/commands/build.dart b/pkg/dartdev/lib/src/commands/build.dart
@@ -5,14 +5,14 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:code_assets/code_assets.dart';
 import 'package:dart2native/generate.dart';
 import 'package:dartdev/src/commands/compile.dart';
 import 'package:dartdev/src/experiments.dart';
 import 'package:dartdev/src/native_assets_bundling.dart';
 import 'package:dartdev/src/sdk.dart';
 import 'package:front_end/src/api_prototype/compiler_options.dart'
     show Verbosity;
-import 'package:native_assets_cli/code_assets.dart';
 import 'package:path/path.dart' as path;
 import 'package:vm/target_os.dart'; // For possible --target-os values.
 
diff --git a/pkg/dartdev/lib/src/commands/compile.dart b/pkg/dartdev/lib/src/commands/compile.dart
@@ -6,13 +6,13 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:args/args.dart';
+import 'package:code_assets/code_assets.dart' show Architecture, OS;
 import 'package:dart2native/generate.dart';
 import 'package:dartdev/src/unified_analytics.dart';
 import 'package:front_end/src/api_prototype/compiler_options.dart'
     show Verbosity;
+import 'package:hooks_runner/hooks_runner.dart' show Target;
 import 'package:http/http.dart' as http;
-import 'package:native_assets_builder/native_assets_builder.dart' show Target;
-import 'package:native_assets_cli/code_assets.dart' show Architecture, OS;
 import 'package:path/path.dart' as path;
 import 'package:vm/target_os.dart';
 
diff --git a/pkg/dartdev/lib/src/native_assets.dart b/pkg/dartdev/lib/src/native_assets.dart
@@ -5,15 +5,15 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:code_assets/code_assets.dart';
 import 'package:dartdev/src/native_assets_bundling.dart';
 import 'package:dartdev/src/sdk.dart';
 import 'package:dartdev/src/utils.dart';
+import 'package:data_assets/data_assets.dart';
 import 'package:file/local.dart';
+import 'package:hooks/hooks.dart';
+import 'package:hooks_runner/hooks_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:native_assets_builder/native_assets_builder.dart';
-import 'package:native_assets_cli/code_assets.dart';
-import 'package:native_assets_cli/data_assets.dart';
-import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:package_config/package_config.dart' as package_config;
 import 'package:yaml/yaml.dart' show loadYaml;
 
@@ -106,7 +106,7 @@ class DartNativeAssetsBuilder {
       kernelAssets,
       dartToolUri,
       header: '''# Native assets mapping for host OS in JIT mode.
-# Generated by dartdev and package:native_assets_builder.
+# Generated by dartdev and package:hooks_runner.
 ''',
     );
   }
diff --git a/pkg/dartdev/lib/src/native_assets_bundling.dart b/pkg/dartdev/lib/src/native_assets_bundling.dart
@@ -4,11 +4,11 @@
 
 import 'dart:io';
 
+import 'package:code_assets/code_assets.dart';
 import 'package:dartdev/src/native_assets_macos.dart';
-import 'package:native_assets_builder/native_assets_builder.dart';
-import 'package:native_assets_cli/code_assets.dart';
-import 'package:native_assets_cli/data_assets.dart';
-import 'package:native_assets_cli/native_assets_cli.dart';
+import 'package:data_assets/data_assets.dart';
+import 'package:hooks/hooks.dart';
+import 'package:hooks_runner/hooks_runner.dart';
 
 final libOutputDirectoryUri = Uri.file('lib/');
 final dataOutputDirectoryUri = Uri.file('assets/');
diff --git a/pkg/dartdev/lib/src/native_assets_macos.dart b/pkg/dartdev/lib/src/native_assets_macos.dart
@@ -4,8 +4,8 @@
 
 import 'dart:io';
 
+import 'package:code_assets/code_assets.dart';
 import 'package:dartdev/src/native_assets_bundling.dart';
-import 'package:native_assets_cli/code_assets.dart';
 
 final _rpathUri = Uri.file('@rpath/');
 
diff --git a/pkg/dartdev/lib/src/sdk_cache.dart b/pkg/dartdev/lib/src/sdk_cache.dart
@@ -6,11 +6,11 @@ import 'dart:convert';
 import 'dart:io' as io;
 import 'dart:typed_data';
 
+import 'package:code_assets/code_assets.dart' show OS;
 import 'package:file/file.dart';
 import 'package:file/local.dart';
+import 'package:hooks_runner/hooks_runner.dart' show Target;
 import 'package:http/http.dart' as http;
-import 'package:native_assets_builder/native_assets_builder.dart' show Target;
-import 'package:native_assets_cli/code_assets.dart' show OS;
 
 /// S_IXUSR bit from POSIX sys/stat.h.
 ///
diff --git a/pkg/dartdev/pubspec.yaml b/pkg/dartdev/pubspec.yaml
@@ -15,22 +15,24 @@ dependencies:
   analyzer: any
   args: any
   cli_util: any
+  code_assets: any
   collection: any
   dart2native: any
   dart_style: any
   dartdoc: any
+  data_assets: any
   dds: any
   dds_service_extensions: any
   dtd_impl: any
   file: any
   front_end: any
   frontend_server: any
+  hooks: any
+  hooks_runner: any
   http: any
   kernel: any
   logging: any
   meta: any
-  native_assets_builder: any
-  native_assets_cli: any
   package_config: any
   path: any
   pub: any
diff --git a/pkg/dartdev/test/commands/compile_test.dart b/pkg/dartdev/test/commands/compile_test.dart
@@ -5,10 +5,10 @@
 import 'dart:io';
 import 'dart:math';
 
+import 'package:code_assets/code_assets.dart';
 import 'package:dart2native/dart2native_macho.dart' show pipeStream;
 import 'package:dart2native/macho.dart';
-import 'package:native_assets_builder/native_assets_builder.dart';
-import 'package:native_assets_cli/code_assets.dart';
+import 'package:hooks_runner/hooks_runner.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
diff --git a/pkg/dartdev/test/native_assets/build_test.dart b/pkg/dartdev/test/native_assets/build_test.dart
@@ -6,7 +6,7 @@
 
 import 'dart:io';
 
-import 'package:native_assets_cli/code_assets.dart';
+import 'package:code_assets/code_assets.dart';
 import 'package:test/test.dart';
 
 import '../utils.dart';
diff --git a/pkg/dartdev/test/native_assets/helpers.dart b/pkg/dartdev/test/native_assets/helpers.dart
@@ -8,9 +8,8 @@ import 'dart:io';
 import 'package:analyzer/src/dart/analysis/experiments.dart';
 import 'package:dartdev/src/sdk.dart';
 import 'package:file/local.dart';
+import 'package:hooks_runner/src/utils/run_process.dart' as run_process;
 import 'package:logging/logging.dart';
-import 'package:native_assets_builder/src/utils/run_process.dart'
-    as run_process;
 import 'package:test/test.dart';
 import 'package:yaml/yaml.dart';
 import 'package:yaml_edit/yaml_edit.dart';
@@ -101,16 +100,17 @@ Future<void> copyTestProjects(Uri copyTargetUri, Logger logger,
     await sourceFile.copy(targetUri.toFilePath());
   }
   final dependencyOverrides = {
-    'native_assets_cli': {
-      'path': sdkRoot
-          .resolve('third_party/pkg/native/pkgs/native_assets_cli/')
-          .toFilePath(),
-    },
-    'native_toolchain_c': {
-      'path': sdkRoot
-          .resolve('third_party/pkg/native/pkgs/native_toolchain_c/')
-          .toFilePath(),
-    },
+    for (final package in [
+      'code_assets',
+      'data_assets',
+      'hooks',
+      'native_toolchain_c'
+    ])
+      package: {
+        'path': sdkRoot
+            .resolve('third_party/pkg/native/pkgs/$package/')
+            .toFilePath(),
+      },
     'meta': {
       'path': sdkRoot.resolve('pkg/meta/').toFilePath(),
     },
@@ -263,7 +263,7 @@ Future<void> nativeAssetsTest(
         'treeshaking_native_libs',
         'user_defines',
       ],
-      sdkRootUri.resolve('third_party/pkg/native/pkgs/native_assets_builder/'),
+      sdkRootUri.resolve('third_party/pkg/native/pkgs/hooks_runner/'),
       sdkRootUri,
       usePubWorkspace,
     );
diff --git a/pkg/dartdev/test/sdk_cache_test.dart b/pkg/dartdev/test/sdk_cache_test.dart
@@ -4,13 +4,14 @@
 
 import 'dart:convert';
 import 'dart:io' as io;
+
+import 'package:code_assets/code_assets.dart' show OS;
 import 'package:dartdev/src/sdk_cache.dart';
 import 'package:file/file.dart';
 import 'package:file/memory.dart';
+import 'package:hooks_runner/hooks_runner.dart' show Target;
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http;
-import 'package:native_assets_builder/native_assets_builder.dart' show Target;
-import 'package:native_assets_cli/code_assets.dart' show OS;
 import 'package:test/test.dart';
 
 const dartArchiveUri = 'https://storage.googleapis.com/dart-archive';
diff --git a/pkg/pkg.status b/pkg/pkg.status
@@ -91,10 +91,10 @@ dart_service_protocol_shared/test/*: SkipByDesign # Only meant to run on vm
 dartdev/test/*: SkipByDesign # Only meant to run on vm
 front_end/test/*: SkipByDesign # Only meant to run on vm, most use dart:mirrors and dart:io
 front_end/tool/*: SkipByDesign # Only meant to run on vm
+hooks_runner/test/*: SkipByDesign # Only meant to run on vm
 modular_test/test/memory_pipeline_test: Slow, Pass
 modular_test/test/validate_pipeline_test: Slow, Pass
 modular_test/test/validate_suite_test: Slow, Pass
-native_assets_builder/test/*: SkipByDesign # Only meant to run on vm
 smith/test/*: SkipByDesign # Only meant to run on vm
 status_file/test/normalize_test: SkipByDesign # Uses dart:io
 status_file/test/parse_and_normalize_test: SkipByDesign # Uses dart:io
diff --git a/pkg/record_use/README.md b/pkg/record_use/README.md
@@ -69,7 +69,7 @@ This information can then be accessed in a link hook as follows:
 ```dart
 import 'dart:convert';
 
-import 'package:native_assets_cli/native_assets_cli.dart';
+import 'package:hooks/hooks.dart';
 import 'package:record_use/record_use_internal.dart';
 
 final methodId = Identifier(
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
@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:logging/logging.dart';
-import 'package:native_assets_cli/native_assets_cli.dart';
-import 'package:native_assets_cli/code_assets.dart';
+import 'package:hooks/hooks.dart';
+import 'package:code_assets/code_assets.dart';
 import 'package:native_toolchain_c/native_toolchain_c.dart';
 
 void main(List<String> arguments) async {
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
@@ -5,8 +5,8 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:native_assets_cli/native_assets_cli.dart';
-import 'package:native_assets_cli/code_assets.dart';
+import 'package:hooks/hooks.dart';
+import 'package:code_assets/code_assets.dart';
 import 'package:record_use/record_use.dart';
 
 void main(List<String> arguments) async {
diff --git a/pkg/record_use/test_data/drop_dylib_recording/pubspec.yaml b/pkg/record_use/test_data/drop_dylib_recording/pubspec.yaml
@@ -10,8 +10,10 @@ environment:
 dependencies:
   logging: ^1.1.1
   meta: any
-  native_assets_cli:
-    path: ../../../../third_party/pkg/native/pkgs/native_assets_cli/
+  hooks:
+    path: ../../../../third_party/pkg/native/pkgs/hooks/
+  code_assets:
+    path: ../../../../third_party/pkg/native/pkgs/code_assets/
   native_toolchain_c:
     path: ../../../../third_party/pkg/native/pkgs/native_toolchain_c/
   record_use:
diff --git a/pkg/test_runner/lib/src/test_configurations.dart b/pkg/test_runner/lib/src/test_configurations.dart
@@ -43,8 +43,10 @@ final testSuiteDirectories = [
   Path('tests/web'),
   Path('third_party/pkg/dart_style'),
   Path('third_party/pkg/dartdoc'),
-  Path('third_party/pkg/native/pkgs/native_assets_builder'),
-  Path('third_party/pkg/native/pkgs/native_assets_cli'),
+  Path('third_party/pkg/native/pkgs/code_assets'),
+  Path('third_party/pkg/native/pkgs/data_assets'),
+  Path('third_party/pkg/native/pkgs/hooks_runner'),
+  Path('third_party/pkg/native/pkgs/hooks'),
   Path('third_party/pkg/native/pkgs/native_toolchain_c'),
   Path('third_party/pkg/package_config'),
   Path('utils/tests/peg'),
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -129,6 +129,8 @@ dependency_overrides:
     path: third_party/pkg/tools/pkgs/cli_util
   clock:
     path: third_party/pkg/tools/pkgs/clock
+  code_assets:
+    path: third_party/pkg/native/pkgs/code_assets
   collection:
     path: third_party/pkg/core/pkgs/collection
   convert:
@@ -147,6 +149,8 @@ dependency_overrides:
     path: third_party/pkg/dart_style
   dartdoc:
     path: third_party/pkg/dartdoc
+  data_assets:
+    path: third_party/pkg/native/pkgs/data_assets
   extension_discovery:
     path: third_party/pkg/tools/pkgs/extension_discovery
   fake_async:
@@ -165,6 +169,10 @@ dependency_overrides:
     path: third_party/pkg/tools/pkgs/glob
   graphs:
     path: third_party/pkg/tools/pkgs/graphs
+  hooks:
+    path: third_party/pkg/native/pkgs/hooks
+  hooks_runner:
+    path: third_party/pkg/native/pkgs/hooks_runner
   html:
     path: third_party/pkg/tools/pkgs/html
   http:
@@ -199,10 +207,6 @@ dependency_overrides:
     path: third_party/pkg/leak_tracker/pkgs/memory_usage
   mime:
     path: third_party/pkg/tools/pkgs/mime
-  native_assets_builder:
-    path: third_party/pkg/native/pkgs/native_assets_builder
-  native_assets_cli:
-    path: third_party/pkg/native/pkgs/native_assets_cli
   native_toolchain_c:
     path: third_party/pkg/native/pkgs/native_toolchain_c
   oauth2:
diff --git a/runtime/tests/vm/dart/run_appended_aot_snapshot_test.dart b/runtime/tests/vm/dart/run_appended_aot_snapshot_test.dart
@@ -8,7 +8,7 @@ import 'dart:io';
 import 'package:dart2native/dart2native.dart' hide platformDill, genSnapshot;
 import 'package:path/path.dart' as path;
 import 'package:expect/expect.dart';
-import 'package:native_assets_cli/code_assets.dart' show OS;
+import 'package:code_assets/code_assets.dart' show OS;
 
 import 'snapshot_test_helper.dart';
 
diff --git a/third_party/.gitignore b/third_party/.gitignore
@@ -20,8 +20,10 @@
 !/pkg/
 /pkg/*
 
-!/pkg/native_assets_builder.status
-!/pkg/native_assets_cli.status
+!/pkg/code_assets.status
+!/pkg/data_assets.status
+!/pkg/hooks_runner.status
+!/pkg/hooks.status
 !/pkg/native_toolchain_c.status
 
 # These packages are authored in third_party.
diff --git a/third_party/OWNERS b/third_party/OWNERS
diff --git a/third_party/pkg/code_assets.status b/third_party/pkg/code_assets.status
diff --git a/third_party/pkg/data_assets.status b/third_party/pkg/data_assets.status
diff --git a/third_party/pkg/hooks.status b/third_party/pkg/hooks.status
diff --git a/third_party/pkg/hooks_runner.status b/third_party/pkg/hooks_runner.status
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
