[deps] Roll package:native_assets_builder

Manual roll of dart-lang/native#946.

Change-Id: I6d4fd28f4174307024526dd73ff29b63e570bfd7
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-try,pkg-mac-release-try,pkg-win-release-arm64-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/357623
Reviewed-by: Moritz Sümmermann <[email protected]>
Commit-Queue: Daco Harkes <[email protected]>

Author: dcharkes

DEPS

@@ -163,7 +163,7 @@ vars = {
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
   "mime_rev": "9a168712d6db610c3822617c132daea72d4fd2b5",
   "mockito_rev": "3ef744f8749864f2a036eba60c4203cc8f638949",
-  "native_rev": "0901a3323022fdb59657cc2cb00ea5c80a8468a6", # mosum@ and dacoharkes@ are rolling breaking changes manually while the assets features are in experimental.
+  "native_rev": "4fc6a333badace5d569bde4496462cc237dc3363", # mosum@ and dacoharkes@ are rolling breaking changes manually while the assets features are in experimental.
   "package_config_rev": "3d90e6955ef19b7ce4f1b742a06a20ed4260700a",
   "path_rev": "a7b696071bd83d3ee0a0f1b57ac94d6b1f05cac4",
   "pool_rev": "c118f69d8a6441a8453bf7d455fd7c79d3ee1497",
@@ -185,7 +185,7 @@ vars = {
   "test_descriptor_rev": "35f97afacb2b7fe627f6ed0bede722fd48980848",
   "test_process_rev": "7fe39afbb6c444f256c1ec0eef008edebcd44644",
   "test_reflective_loader_rev": "9862703a3d14848376c8efde271c88022fba91eb",
-  "tools_rev": "fca993e4f287e8080f2a8d91dbfbace8b6a8a0bc",
+  "tools_rev": "378790dd8cdaecd8cb48283de445f7cf80419cc0",
   "typed_data_rev": "375efaa02a13dad0785cfbd9bdcb9f09aa8ef529",
   "usage_rev": "67ecd7d1328347ec15cbf8d8a46918df75a66af8",
   "vector_math_rev": "7e705f734e94917e9a5347578e6e496f8db38ac6",

pkg/bisect_dart/lib/src/run_bisection.dart

@@ -15,7 +15,9 @@ Future<void> runMain(List<String> args) async {
     print(BisectionConfig.helpMessage());
     return;
   }
-  final config = BisectionConfig.fromConfig(await Config.fromArgs(args: args));
+  final config = BisectionConfig.fromConfig(
+    await Config.fromArguments(arguments: args),
+  );
   await runBisection(config);
 }
 

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

@@ -12,6 +12,7 @@ import 'package:dartdev/src/sdk.dart';
 import 'package:front_end/src/api_prototype/compiler_options.dart'
     show Verbosity;
 import 'package:native_assets_builder/native_assets_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_assets_cli/native_assets_cli_internal.dart';
 import 'package:path/path.dart' as path;
 import 'package:vm/target_os.dart'; // For possible --target-os values.
@@ -132,20 +133,24 @@ class BuildCommand extends DartdevCommand {
     ).build(
       workingDirectory: workingDirectory,
       target: target,
-      linkModePreference: LinkModePreference.dynamic,
-      buildMode: BuildMode.release,
+      linkModePreference: LinkModePreferenceImpl.dynamic,
+      buildMode: BuildModeImpl.release,
       includeParentEnvironment: true,
+      supportedAssetTypes: [
+        NativeCodeAsset.type,
+      ],
     );
-    final nativeAssets = buildResult.assets;
     if (!buildResult.success) {
       stderr.write('Native assets build failed.');
       return 255;
     }
+    final assets = buildResult.assets;
+    final nativeAssets = assets.whereType<NativeCodeAssetImpl>();
     final staticAssets =
-        nativeAssets.where((e) => e.linkMode == LinkMode.static);
+        nativeAssets.where((e) => e.linkMode == StaticLinkingImpl());
     if (staticAssets.isNotEmpty) {
       stderr.write(
-          """'dart build' does not yet support native artifacts packaged as ${LinkMode.static.name}.
+          """'dart build' does not yet support NativeCodeAssets with static linking.
 Use linkMode as dynamic library instead.""");
       return 255;
     }
@@ -155,23 +160,23 @@ Use linkMode as dynamic library instead.""");
     final tempDir = Directory.systemTemp.createTempSync();
     if (nativeAssets.isNotEmpty) {
       stdout.writeln('Copying native assets.');
-      KernelAsset targetLocation(Asset asset) {
-        final path = asset.path;
+      KernelAsset targetLocation(NativeCodeAssetImpl asset) {
+        final linkMode = asset.linkMode;
         final KernelAssetPath kernelAssetPath;
-        switch (path) {
-          case AssetSystemPath _:
-            kernelAssetPath = KernelAssetSystemPath(path.uri);
-          case AssetInExecutable _:
+        switch (linkMode) {
+          case DynamicLoadingSystemImpl _:
+            kernelAssetPath = KernelAssetSystemPath(linkMode.uri);
+          case LookupInExecutableImpl _:
             kernelAssetPath = KernelAssetInExecutable();
-          case AssetInProcess _:
+          case LookupInProcessImpl _:
             kernelAssetPath = KernelAssetInProcess();
-          case AssetAbsolutePath _:
+          case DynamicLoadingBundledImpl _:
             kernelAssetPath = KernelAssetRelativePath(
-              Uri(path: path.uri.pathSegments.last),
+              Uri(path: asset.file!.pathSegments.last),
             );
           default:
             throw Exception(
-              'Unsupported asset path type ${path.runtimeType} in asset $asset',
+              'Unsupported NativeCodeAsset linkMode ${linkMode.runtimeType} in asset $asset',
             );
         }
         return KernelAsset(
@@ -187,12 +192,10 @@ Use linkMode as dynamic library instead.""");
       final copiedFiles = await Future.wait([
         for (final assetMapping in assetTargetLocations.entries)
           if (assetMapping.value.path is KernelAssetRelativePath)
-            File.fromUri((assetMapping.key.path as AssetAbsolutePath).uri).copy(
-                outputUri
-                    .resolveUri(
-                        (assetMapping.value.path as KernelAssetRelativePath)
-                            .uri)
-                    .toFilePath())
+            File.fromUri(assetMapping.key.file!).copy(outputUri
+                .resolveUri(
+                    (assetMapping.value.path as KernelAssetRelativePath).uri)
+                .toFilePath())
       ]);
       stdout.writeln('Copied ${copiedFiles.length} native assets.');
 

pkg/dartdev/lib/src/native_assets.dart

@@ -8,6 +8,7 @@ import 'dart:io';
 import 'package:dartdev/src/sdk.dart';
 import 'package:logging/logging.dart';
 import 'package:native_assets_builder/native_assets_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_assets_cli/native_assets_cli_internal.dart';
 
 import 'core.dart';
@@ -16,7 +17,7 @@ import 'core.dart';
 ///
 /// If provided, only native assets of all transitive dependencies of
 /// [runPackageName] are built.
-Future<(bool success, List<Asset> assets)> compileNativeAssetsJit({
+Future<(bool success, List<AssetImpl> assets)> compileNativeAssetsJit({
   required bool verbose,
   String? runPackageName,
 }) async {
@@ -26,7 +27,7 @@ Future<(bool success, List<Asset> assets)> compileNativeAssetsJit({
   if (!await File.fromUri(
           workingDirectory.resolve('.dart_tool/package_config.json'))
       .exists()) {
-    return (true, <Asset>[]);
+    return (true, <AssetImpl>[]);
   }
   final buildResult = await NativeAssetsBuildRunner(
     // This always runs in JIT mode.
@@ -37,11 +38,14 @@ Future<(bool success, List<Asset> assets)> compileNativeAssetsJit({
     // When running in JIT mode, only the host OS needs to be build.
     target: Target.current,
     // When running in JIT mode, only dynamic libraries are supported.
-    linkModePreference: LinkModePreference.dynamic,
+    linkModePreference: LinkModePreferenceImpl.dynamic,
     // Dart has no concept of release vs debug, default to release.
-    buildMode: BuildMode.release,
+    buildMode: BuildModeImpl.release,
     includeParentEnvironment: true,
     runPackageName: runPackageName,
+    supportedAssetTypes: [
+      NativeCodeAsset.type,
+    ],
   );
   return (buildResult.success, buildResult.assets);
 }
@@ -65,7 +69,8 @@ Future<(bool success, Uri? nativeAssetsYaml)> compileNativeAssetsJitYamlFile({
     return (false, null);
   }
   final kernelAssets = KernelAssets([
-    for (final asset in assets) _targetLocation(asset),
+    for (final asset in assets.whereType<NativeCodeAssetImpl>())
+      _targetLocation(asset),
   ]);
 
   final workingDirectory = Directory.current.uri;
@@ -78,26 +83,26 @@ ${kernelAssets.toNativeAssetsFile()}''';
   return (true, assetsUri);
 }
 
-KernelAsset _targetLocation(Asset asset) {
-  final path = asset.path;
+KernelAsset _targetLocation(NativeCodeAssetImpl asset) {
+  final linkMode = asset.linkMode;
   final KernelAssetPath kernelAssetPath;
-  switch (path) {
-    case AssetSystemPath _:
-      kernelAssetPath = KernelAssetSystemPath(path.uri);
-    case AssetInExecutable _:
+  switch (linkMode) {
+    case DynamicLoadingSystemImpl _:
+      kernelAssetPath = KernelAssetSystemPath(linkMode.uri);
+    case LookupInExecutableImpl _:
       kernelAssetPath = KernelAssetInExecutable();
-    case AssetInProcess _:
+    case LookupInProcessImpl _:
       kernelAssetPath = KernelAssetInProcess();
-    case AssetAbsolutePath _:
-      kernelAssetPath = KernelAssetAbsolutePath(path.uri);
+    case DynamicLoadingBundledImpl _:
+      kernelAssetPath = KernelAssetAbsolutePath(asset.file!);
     default:
       throw Exception(
-        'Unsupported asset path type ${path.runtimeType} in asset $asset',
+        'Unsupported NativeCodeAsset linkMode ${linkMode.runtimeType} in asset $asset',
       );
   }
   return KernelAsset(
     id: asset.id,
-    target: asset.target,
+    target: Target.fromArchitectureAndOS(asset.architecture!, asset.os),
     path: kernelAssetPath,
   );
 }

pkg/test_runner/lib/src/configuration.dart

@@ -8,7 +8,7 @@ import 'dart:ffi';
 import 'dart:io';
 
 import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    show CCompilerConfig;
+    show CCompilerConfigImpl;
 import 'package:smith/configuration.dart';
 import 'package:smith/smith.dart';
 
@@ -285,12 +285,12 @@ class TestConfiguration {
 
   late final Map<String, String> nativeCompilerEnvironmentVariables = () {
     String unparseKey(String key) => key.replaceAll('.', '__').toUpperCase();
-    final arKey = unparseKey(CCompilerConfig.arConfigKeyFull);
-    final ccKey = unparseKey(CCompilerConfig.ccConfigKeyFull);
-    final ldKey = unparseKey(CCompilerConfig.ldConfigKeyFull);
-    final envScriptKey = unparseKey(CCompilerConfig.envScriptConfigKeyFull);
+    final arKey = unparseKey(CCompilerConfigImpl.arConfigKeyFull);
+    final ccKey = unparseKey(CCompilerConfigImpl.ccConfigKeyFull);
+    final ldKey = unparseKey(CCompilerConfigImpl.ldConfigKeyFull);
+    final envScriptKey = unparseKey(CCompilerConfigImpl.envScriptConfigKeyFull);
     final envScriptArgsKey =
-        unparseKey(CCompilerConfig.envScriptArgsConfigKeyFull);
+        unparseKey(CCompilerConfigImpl.envScriptArgsConfigKeyFull);
 
     if (Platform.isWindows) {
       // Use MSVC from Depot Tools instead. When using clang from DEPS, we still