[deps] Roll dart-lang/native

dcharkes · Commit Queue · commit 108e40f31b2d · 2025-04-29T05:54:11.000-07:00
Change-Id: I418ca4177b64ec566d6e5afa876f6ab23c77a4f9 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/+/425040 Reviewed-by: Michael Goderbauer <goderbauer@google.com> Commit-Queue: Daco Harkes <dacoharkes@google.com>
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": "f1e2d898e78c17ff413727a58170d4bc21ec5678", # rolled manually while native assets are experimental
+  "native_rev": "625ed307c45925b4e216250745b15907bfa237ff", # 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
@@ -7,7 +7,7 @@ import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
 import 'package:kernel/binary/tag.dart' show Tag;
-import 'package:native_assets_cli/code_assets_builder.dart' show OS;
+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_builder.dart' show OS;
+import 'package:native_assets_cli/code_assets.dart' show OS;
 import 'package:path/path.dart' as path;
 
 import 'dart2native.dart';
diff --git a/pkg/dartdev/lib/src/commands/build.dart b/pkg/dartdev/lib/src/commands/build.dart
@@ -12,7 +12,7 @@ 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_builder.dart';
+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
@@ -11,8 +11,8 @@ import 'package:dartdev/src/unified_analytics.dart';
 import 'package:front_end/src/api_prototype/compiler_options.dart'
     show Verbosity;
 import 'package:http/http.dart' as http;
-import 'package:native_assets_cli/code_assets_builder.dart'
-    show Architecture, OS, Target;
+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
@@ -11,8 +11,9 @@ import 'package:dartdev/src/utils.dart';
 import 'package:file/local.dart';
 import 'package:logging/logging.dart';
 import 'package:native_assets_builder/native_assets_builder.dart';
-import 'package:native_assets_cli/code_assets_builder.dart';
-import 'package:native_assets_cli/data_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;
 
diff --git a/pkg/dartdev/lib/src/native_assets_bundling.dart b/pkg/dartdev/lib/src/native_assets_bundling.dart
@@ -6,8 +6,9 @@ import 'dart:io';
 
 import 'package:dartdev/src/native_assets_macos.dart';
 import 'package:native_assets_builder/native_assets_builder.dart';
-import 'package:native_assets_cli/code_assets_builder.dart';
-import 'package:native_assets_cli/data_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';
 
 final libOutputDirectoryUri = Uri.file('lib/');
 final dataOutputDirectoryUri = Uri.file('assets/');
@@ -102,12 +103,10 @@ List<({Object asset, KernelAsset target})> _targetMapping(
   Uri outputUri,
   bool relocatable,
 ) {
-  final codeAssets = assets
-      .where((asset) => asset.isCodeAsset)
-      .map(CodeAsset.fromEncoded);
-  final dataAssets = assets
-      .where((asset) => asset.isDataAsset)
-      .map(DataAsset.fromEncoded);
+  final codeAssets =
+      assets.where((asset) => asset.isCodeAsset).map(CodeAsset.fromEncoded);
+  final dataAssets =
+      assets.where((asset) => asset.isDataAsset).map(DataAsset.fromEncoded);
 
   return [
     for (final asset in codeAssets)
diff --git a/pkg/dartdev/lib/src/sdk_cache.dart b/pkg/dartdev/lib/src/sdk_cache.dart
@@ -9,7 +9,8 @@ import 'dart:typed_data';
 import 'package:file/file.dart';
 import 'package:file/local.dart';
 import 'package:http/http.dart' as http;
-import 'package:native_assets_cli/code_assets_builder.dart' show OS, Target;
+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/test/commands/compile_test.dart b/pkg/dartdev/test/commands/compile_test.dart
@@ -7,7 +7,8 @@ import 'dart:math';
 
 import 'package:dart2native/dart2native_macho.dart' show pipeStream;
 import 'package:dart2native/macho.dart';
-import 'package:native_assets_cli/code_assets_builder.dart';
+import 'package:native_assets_builder/native_assets_builder.dart';
+import 'package:native_assets_cli/code_assets.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_builder.dart';
+import 'package:native_assets_cli/code_assets.dart';
 import 'package:test/test.dart';
 
 import '../utils.dart';
diff --git a/pkg/dartdev/test/sdk_cache_test.dart b/pkg/dartdev/test/sdk_cache_test.dart
@@ -9,7 +9,8 @@ import 'package:file/file.dart';
 import 'package:file/memory.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http;
-import 'package:native_assets_cli/code_assets_builder.dart' show Target, OS;
+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/record_use/test_data/drop_dylib_recording/hook/build.dart b/pkg/record_use/test_data/drop_dylib_recording/hook/build.dart
@@ -3,45 +3,34 @@
 // 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:native_toolchain_c/native_toolchain_c.dart';
 
 void main(List<String> arguments) async {
   await build(arguments, (input, output) async {
-    final logger = Logger('')
-      ..level = Level.ALL
-      ..onRecord.listen((record) {
-        print('${record.level.name}: ${record.time}: ${record.message}');
-      });
-    final routing = input.config.linkingEnabled
-        ? [ToLinkHook(input.packageName)]
-        : const [ToAppBundle()];
+    final logger =
+        Logger('')
+          ..level = Level.ALL
+          ..onRecord.listen((record) {
+            print('${record.level.name}: ${record.time}: ${record.message}');
+          });
+    final routing =
+        input.config.linkingEnabled
+            ? [ToLinkHook(input.packageName)]
+            : const [ToAppBundle()];
     await CBuilder.library(
       name: 'add',
       assetName: 'dylib_add',
-      sources: [
-        'src/native_add.c',
-      ],
+      sources: ['src/native_add.c'],
       linkModePreference: LinkModePreference.dynamic,
-    ).run(
-      input: input,
-      output: output,
-      logger: logger,
-      routing: routing,
-    );
+    ).run(input: input, output: output, logger: logger, routing: routing);
 
     await CBuilder.library(
       name: 'multiply',
       assetName: 'dylib_multiply',
-      sources: [
-        'src/native_multiply.c',
-      ],
+      sources: ['src/native_multiply.c'],
       linkModePreference: LinkModePreference.dynamic,
-    ).run(
-      input: input,
-      output: output,
-      logger: logger,
-      routing: routing,
-    );
+    ).run(input: input, output: output, logger: logger, routing: routing);
   });
 }
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,6 +5,7 @@
 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:record_use/record_use.dart';
 
@@ -13,42 +14,48 @@ void main(List<String> arguments) async {
     final recordedUsagesFile = input.recordedUsagesFile;
     if (recordedUsagesFile == null) {
       throw ArgumentError(
-          'Enable the --enable-experiments=record-use experiment to use this app.');
+        'Enable the --enable-experiments=record-use experiment to use this app.',
+      );
     }
     final usages = await recordedUsages(recordedUsagesFile);
     final codeAssets = input.assets.code;
     print('Received assets: ${codeAssets.map((a) => a.id).join(', ')}.');
 
     final symbols = <String>{};
     final argumentsFile =
-        await File.fromUri(input.outputDirectory.resolve('arguments.txt'))
-            .create();
+        await File.fromUri(
+          input.outputDirectory.resolve('arguments.txt'),
+        ).create();
 
     final dataLines = <String>[];
     // Tree-shake unused assets using calls
     for (final methodName in ['add', 'multiply']) {
       final calls = usages.constArgumentsFor(
-          Identifier(
-            importUri:
-                'package:drop_dylib_recording/src/drop_dylib_recording.dart',
-            scope: 'MyMath',
-            name: methodName,
-          ),
-          'int add(int a, int b)');
+        Identifier(
+          importUri:
+              'package:drop_dylib_recording/src/drop_dylib_recording.dart',
+          scope: 'MyMath',
+          name: methodName,
+        ),
+        'int add(int a, int b)',
+      );
       for (var call in calls) {
         dataLines.add(
-            'A call was made to "$methodName" with the arguments (${call.positional[0] as int},${call.positional[1] as int})');
+          'A call was made to "$methodName" with the arguments (${call.positional[0] as int},${call.positional[1] as int})',
+        );
         symbols.add(methodName);
       }
     }
 
     argumentsFile.writeAsStringSync(dataLines.join('\n'));
 
     // Tree-shake unused assets
-    final instances = usages.constantsOf(Identifier(
-      importUri: 'package:drop_dylib_recording/src/drop_dylib_recording.dart',
-      name: 'RecordCallToC',
-    ));
+    final instances = usages.constantsOf(
+      Identifier(
+        importUri: 'package:drop_dylib_recording/src/drop_dylib_recording.dart',
+        name: 'RecordCallToC',
+      ),
+    );
     for (final instance in instances) {
       final symbol = instance['symbol'] as String;
       symbols.add(symbol);
@@ -69,7 +76,8 @@ void main(List<String> arguments) async {
 Future<RecordedUsages> recordedUsages(Uri recordedUsagesFile) async {
   final file = File.fromUri(recordedUsagesFile);
   final string = await file.readAsString();
-  final usages =
-      RecordedUsages.fromJson(jsonDecode(string) as Map<String, Object?>);
+  final usages = RecordedUsages.fromJson(
+    jsonDecode(string) as Map<String, Object?>,
+  );
   return usages;
 }
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_builder.dart' show OS;
+import 'package:native_assets_cli/code_assets.dart' show OS;
 
 import 'snapshot_test_helper.dart';
 
@@ -31,15 +31,14 @@ Future<void> main(List<String> args) async {
     final String dillPath = path.join(tmp, 'test.dill');
     final String aotPath = path.join(tmp, 'test.aot');
     final String exePath = path.join(tmp, exeName);
-    final extraGenKernelOptions =
-        Platform.executableArguments
-            .where(
-              (arg) =>
-                  arg.startsWith('--enable-experiment=') ||
-                  arg == '--sound-null-safety' ||
-                  arg == '--no-sound-null-safety',
-            )
-            .toList();
+    final extraGenKernelOptions = Platform.executableArguments
+        .where(
+          (arg) =>
+              arg.startsWith('--enable-experiment=') ||
+              arg == '--sound-null-safety' ||
+              arg == '--no-sound-null-safety',
+        )
+        .toList();
 
     {
       final result = await generateAotKernel(
diff --git a/third_party/pkg/native_assets_cli.status b/third_party/pkg/native_assets_cli.status
@@ -3,6 +3,7 @@
 # BSD-style license that can be found in the LICENSE file.
 
 example/*: SkipByDesign # These test projects don't work without running pub in the project itself.
+lib/src/*: SkipByDesign # These are not tests.
 
 [ $runtime != vm ]
 *: SkipByDesign # Native assets is a VM-only feature.
