[deps] Roll dart-lang/native

The dart-lang/native packages do no longer have path dependencies in
them. So instead of rewriting those paths in the tests, write
dependency overrides into the test projects.

To simplify path handling, use absolute paths in the dependency
overrides.

Change-Id: I0db8529543a280fe937465e9a9c9aa4bb8fd0ee1
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/+/420900
Auto-Submit: Daco Harkes <[email protected]>
Reviewed-by: Moritz Sümmermann <[email protected]>
Commit-Queue: Moritz Sümmermann <[email protected]>

Author: dcharkes

DEPS

@@ -137,7 +137,7 @@ vars = {
   "i18n_rev": "de1943629469719bf34269bf90fcdbe9334a73f3",
   "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
-  "native_rev": "4928765d7681ad8a4211c5977afd2f93f50b3f65", # rolled manually while native assets are experimental
+  "native_rev": "4e71c281e4e3c262b28b7ab5b3306e4029b78b1c", # rolled manually while native assets are experimental
   "protobuf_rev": "1aaa332af75c61ff32739821f7ec52186ff18d4c",
   "pub_rev": "b2c03b448a47fdd52800609b9222cd737be3a934", # rolled manually
   "shelf_rev": "082d3ac2d13a98700d8148e8fad8f3e12a6fd0e1",

pkg/dartdev/pubspec.yaml

@@ -45,3 +45,4 @@ dev_dependencies:
   lints: any
   pub_semver: any
   test: any
+  yaml_edit: any

pkg/dartdev/test/native_assets/helpers.dart

@@ -13,6 +13,7 @@ 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';
 
 extension UriExtension on Uri {
   Uri get parent {
@@ -67,7 +68,7 @@ Future<run_process.RunProcessResult> runProcess({
     );
 
 Future<void> copyTestProjects(
-    Uri copyTargetUri, Logger logger, Uri packageLocation) async {
+    Uri copyTargetUri, Logger logger, Uri packageLocation, Uri sdkRoot) async {
   // Reuse the test projects from `pkg:native`.
   final testProjectsUri = packageLocation.resolve('test_data/');
   final manifestUri = testProjectsUri.resolve('manifest.yaml');
@@ -101,10 +102,31 @@ Future<void> copyTestProjects(
     final sourceFile = File.fromUri(testProjectsUri.resolveUri(pathToModify));
     final targetUri = copyTargetUri.resolveUri(pathToModify);
     final sourceString = await sourceFile.readAsString();
-    final modifiedString = sourceString.replaceAll(
-      'path: ../../',
-      'path: ${packageLocation.toFilePath().replaceAll('\\', '/')}',
-    );
+    final pubspec = YamlEditor(sourceString);
+    if ((loadYamlNode(sourceString) as Map)['resolution'] != null) {
+      pubspec.remove(['resolution']);
+    }
+    pubspec.update([
+      'dependency_overrides'
+    ], {
+      '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(),
+      },
+      'meta': {
+        'path': sdkRoot.resolve('pkg/meta/').toFilePath(),
+      },
+      'record_use': {
+        'path': sdkRoot.resolve('pkg/record_use/').toFilePath(),
+      },
+    });
+    final modifiedString = pubspec.toString();
     await File.fromUri(targetUri).writeAsString(modifiedString);
   }
 
@@ -195,6 +217,7 @@ Future<void> nativeAssetsTest(
       ],
       Platform.script.resolve(
           '../../../../third_party/pkg/native/pkgs/native_assets_builder/'),
+      Platform.script.resolve('../../../../'),
     );
 
 Future<void> recordUseTest(
@@ -208,18 +231,20 @@ Future<void> recordUseTest(
       fun,
       const ['drop_dylib_recording'],
       Platform.script.resolve('../../../record_use/'),
+      Platform.script.resolve('../../../../'),
     );
 
 Future<void> runPackageTest(
   String packageUnderTest,
   bool skipPubGet,
   Future<void> Function(Uri) fun,
   List<String> validPackages,
-  Uri packageLocation,
+    Uri packageLocation,
+    Uri sdkRoot
 ) async {
   assert(validPackages.contains(packageUnderTest));
   return await inTempDir((tempUri) async {
-    await copyTestProjects(tempUri, logger, packageLocation);
+    await copyTestProjects(tempUri, logger, packageLocation, sdkRoot);
     final packageUri = tempUri.resolve('$packageUnderTest/');
     if (!skipPubGet) {
       await runPubGet(workingDirectory: packageUri, logger: logger);

pkg/record_use/test_data/drop_dylib_recording/pubspec.yaml

@@ -21,7 +21,6 @@ dev_dependencies:
   lints: any
   test: any
 
-
 dependency_overrides:
   meta:
     path: ../../../meta/