commit c45243cbe26691f29d2e98739976c661b897d86d
author Devon Carew <devoncarew@google.com> Tue Oct 08 20:38:50 2024 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 08 20:38:50 2024 +0000
tree c91abf5064739199318a4b4b63001cae3f9bd612
parent ccbd0c61295df9750585c08850778dfdb95969e3

[deps] bump dart-lang/tools to bring in package:file, file_testing

Change-Id: Iaf986acd6a7833570bfa6fc86d0cbbb617e3efea
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/388942
Reviewed-by: Nate Bosch <nbosch@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>

DEPS

diff --git a/DEPS b/DEPS
index f4b9eb7..248c646 100644
--- a/DEPS
+++ b/DEPS
@@ -184,7 +184,7 @@
   "test_descriptor_rev": "a3db1efe3dc725dcae9ee61647d3bfc19b3231ac",
   "test_process_rev": "52ee3f5ab70ed965bb7122c1d499081fbccd0bde",
   "test_reflective_loader_rev": "598af2f503955020af0eaa82558d574a03934078",
-  "tools_rev": "d4995d47b99d5e9564abfed2218f4a23df75983b", #
+  "tools_rev": "3f7a46606496f826c2f60586ab71c2b7a9bfbf15",
   "typed_data_rev": "6abfafdcf661cd8a814619d7e2a3e99edb3a3862",
   "vector_math_rev": "2cfbe2c115a57b368ccbc3c89ebd38a06764d3d1",
   "watcher_rev": "3b850778ad0b62db3aa2cfe48832870c2461db30",

tools/generate_package_config.dart

diff --git a/tools/generate_package_config.dart b/tools/generate_package_config.dart
index 4d486e8..4e2cd4a 100644
--- a/tools/generate_package_config.dart
+++ b/tools/generate_package_config.dart
@@ -88,6 +88,14 @@
   ];
   packages.sort((a, b) => a.name.compareTo(b.name));
 
+  // TODO(devoncarew): Temporarily ignore the second package:file and
+  // package:file_testing locations.
+  packages.removeWhere((p) {
+    final path = posix(p.rootUri);
+    return path == 'third_party/pkg/file/packages/file' ||
+        path == 'third_party/pkg/file/packages/file_testing';
+  });
+
   // Remove any packages with identical names.
   final uniqueNames = packages.map((p) => p.name).toSet();