[deps] Roll dart-lang/native

Manuall roll for dart-lang/native#964.

TEST=pkg/dartdev/test/native_assets/

Change-Id: Ie1e762ed57971db105cc9d6d5fa21e9f99e76453
Cq-Include-Trybots: luci.dart.try:pkg-win-release-try,pkg-win-release-arm64-try,pkg-mac-release-try,pkg-mac-release-arm64-try,pkg-linux-release-try,pkg-linux-release-arm64-try,pkg-linux-debug-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/352642
Reviewed-by: Moritz Sümmermann <[email protected]>
Commit-Queue: Daco Harkes <[email protected]>

Author: dcharkes

DEPS

@@ -162,7 +162,7 @@ vars = {
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
   "mime_rev": "9a168712d6db610c3822617c132daea72d4fd2b5",
   "mockito_rev": "7d6632fd679f0f6aae32ee74038ba8cb6b64a607",
-  "native_rev": "b1a0c2a211c2c85d9392b74abacef5eca7a62364", # mosum@ and dacoharkes@ are rolling breaking changes manually while the assets features are in experimental.
+  "native_rev": "0901a3323022fdb59657cc2cb00ea5c80a8468a6", # mosum@ and dacoharkes@ are rolling breaking changes manually while the assets features are in experimental.
   "package_config_rev": "4a7042bb286cf0b41b26e87972bc28bda535f8b9",
   "path_rev": "a7b696071bd83d3ee0a0f1b57ac94d6b1f05cac4",
   "pool_rev": "782da82fedca4e5776e43ba321543ed2b20373b2",

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

@@ -141,7 +141,8 @@ class BuildCommand extends DartdevCommand {
       stderr.write('Native assets build failed.');
       return 255;
     }
-    final staticAssets = nativeAssets.whereLinkMode(LinkMode.static);
+    final staticAssets =
+        nativeAssets.where((e) => e.linkMode == LinkMode.static);
     if (staticAssets.isNotEmpty) {
       stderr.write(
           """'dart build' does not yet support native artifacts packaged as ${LinkMode.static.name}.
@@ -154,42 +155,51 @@ Use linkMode as dynamic library instead.""");
     final tempDir = Directory.systemTemp.createTempSync();
     if (nativeAssets.isNotEmpty) {
       stdout.writeln('Copying native assets.');
-      Asset targetLocation(Asset asset) {
+      KernelAsset targetLocation(Asset asset) {
         final path = asset.path;
+        final KernelAssetPath kernelAssetPath;
         switch (path) {
           case AssetSystemPath _:
+            kernelAssetPath = KernelAssetSystemPath(path.uri);
           case AssetInExecutable _:
+            kernelAssetPath = KernelAssetInExecutable();
           case AssetInProcess _:
-            return asset;
+            kernelAssetPath = KernelAssetInProcess();
           case AssetAbsolutePath _:
-            return asset.copyWith(
-              path: AssetRelativePath(
-                Uri(
-                  path: path.uri.pathSegments.last,
-                ),
-              ),
+            kernelAssetPath = KernelAssetRelativePath(
+              Uri(path: path.uri.pathSegments.last),
+            );
+          default:
+            throw Exception(
+              'Unsupported asset path type ${path.runtimeType} in asset $asset',
             );
         }
-        throw 'Unsupported asset path type ${path.runtimeType} in asset $asset';
+        return KernelAsset(
+          id: asset.id,
+          target: target,
+          path: kernelAssetPath,
+        );
       }
 
       final assetTargetLocations = {
         for (final asset in nativeAssets) asset: targetLocation(asset),
       };
-      await Future.wait([
+      final copiedFiles = await Future.wait([
         for (final assetMapping in assetTargetLocations.entries)
-          if (assetMapping.key != assetMapping.value)
+          if (assetMapping.value.path is KernelAssetRelativePath)
             File.fromUri((assetMapping.key.path as AssetAbsolutePath).uri).copy(
                 outputUri
                     .resolveUri(
-                        (assetMapping.value.path as AssetRelativePath).uri)
+                        (assetMapping.value.path as KernelAssetRelativePath)
+                            .uri)
                     .toFilePath())
       ]);
+      stdout.writeln('Copied ${copiedFiles.length} native assets.');
 
       tempUri = tempDir.uri;
       nativeAssetsDartUri = tempUri.resolve('native_assets.yaml');
-      final assetsContent =
-          assetTargetLocations.values.toList().toNativeAssetsFile();
+      final assetsContent = KernelAssets(assetTargetLocations.values.toList())
+          .toNativeAssetsFile();
       await Directory.fromUri(nativeAssetsDartUri.resolve('.')).create();
       await File(nativeAssetsDartUri.toFilePath()).writeAsString(assetsContent);
     }

pkg/dartdev/lib/src/native_assets.dart

@@ -64,17 +64,44 @@ Future<(bool success, Uri? nativeAssetsYaml)> compileNativeAssetsJitYamlFile({
   if (!success) {
     return (false, null);
   }
+  final kernelAssets = KernelAssets([
+    for (final asset in assets) _targetLocation(asset),
+  ]);
 
   final workingDirectory = Directory.current.uri;
   final assetsUri = workingDirectory.resolve('.dart_tool/native_assets.yaml');
   final nativeAssetsYaml = '''# Native assets mapping for host OS in JIT mode.
-# Generated by dartdev and package:native.
-${assets.toNativeAssetsFile()}''';
+# Generated by dartdev and package:native_assets_builder.
+${kernelAssets.toNativeAssetsFile()}''';
   final assetFile = File(assetsUri.toFilePath());
   await assetFile.writeAsString(nativeAssetsYaml);
   return (true, assetsUri);
 }
 
+KernelAsset _targetLocation(Asset asset) {
+  final path = asset.path;
+  final KernelAssetPath kernelAssetPath;
+  switch (path) {
+    case AssetSystemPath _:
+      kernelAssetPath = KernelAssetSystemPath(path.uri);
+    case AssetInExecutable _:
+      kernelAssetPath = KernelAssetInExecutable();
+    case AssetInProcess _:
+      kernelAssetPath = KernelAssetInProcess();
+    case AssetAbsolutePath _:
+      kernelAssetPath = KernelAssetAbsolutePath(path.uri);
+    default:
+      throw Exception(
+        'Unsupported asset path type ${path.runtimeType} in asset $asset',
+      );
+  }
+  return KernelAsset(
+    id: asset.id,
+    target: asset.target,
+    path: kernelAssetPath,
+  );
+}
+
 Future<bool> warnOnNativeAssets() async {
   final workingDirectory = Directory.current.uri;
   if (!await File.fromUri(