Skip to content

Commit 4a33372

Browse files
devoncarewCommit Queue
authored andcommitted
Revert "[deps] remove the dep on the google/file.dart repo"
This reverts commit fca6949. Reason for revert: this CL broke the HHH bot and golem Original change's description: > [deps] remove the dep on the google/file.dart repo > > Change-Id: I2fdca859906a4c6d7713cde1131ead77b4230750 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389405 > Reviewed-by: Nate Bosch <[email protected]> > Commit-Queue: Devon Carew <[email protected]> Change-Id: Ic3e869a867508a984ad44bbb8455dafd11804125 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389881 Commit-Queue: Nate Bosch <[email protected]> Reviewed-by: Nate Bosch <[email protected]> Bot-Commit: Rubber Stamper <[email protected]> Auto-Submit: Devon Carew <[email protected]>
1 parent f77b5c1 commit 4a33372

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

DEPS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ vars = {
146146
"dart_style_rev": "5d35f4d829ffb8532d345d95d3e9504ae6cd839e", # disable tools/rev_sdk_deps.dart
147147
"dartdoc_rev": "80c6f18f34b387d4b9ce89ddd2e3049093335f9d",
148148
"ecosystem_rev": "2d58550f9e3fd8ecbc3b2e4444095fcb204a66c6",
149+
"file_rev": "6842feaef1c4e06239bd30f8d3ef722838b1c97e",
149150
"fixnum_rev": "83293b8ed86ccd574a94fcf4a2da43f31c1b43e0",
150151
"flute_rev": "a531c96a8b43d015c6bfbbfe3ab54867b0763b8b",
151152
"glob_rev": "00a9c82d31c01ae88ec9ae4021d842e9b832aa52",
@@ -421,6 +422,9 @@ deps = {
421422
"url": Var("dart_git") + "flute.git" + "@" + Var("flute_rev"),
422423
"condition": "checkout_flute",
423424
},
425+
Var("dart_root") + "/third_party/pkg/file":
426+
Var("dart_git") + "external/github.com/google/file.dart"
427+
+ "@" + Var("file_rev"),
424428
Var("dart_root") + "/third_party/pkg/glob":
425429
Var("dart_git") + "glob.git" + "@" + Var("glob_rev"),
426430
Var("dart_root") + "/third_party/pkg/html":

tools/generate_package_config.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import 'dart:convert';
99
import 'dart:io';
1010

1111
// Important! Do not add package: imports to this file.
12-
//
1312
// Do not add relative deps for libraries that themselves use package deps.
14-
//
1513
// This tool runs before the .dart_tool/package_config.json file is created, so
1614
// can not itself use package references.
1715

@@ -90,6 +88,14 @@ void main(List<String> args) {
9088
];
9189
packages.sort((a, b) => a.name.compareTo(b.name));
9290

91+
// TODO(devoncarew): Temporarily ignore the second package:file and
92+
// package:file_testing locations.
93+
packages.removeWhere((p) {
94+
final path = posix(p.rootUri);
95+
return path == 'third_party/pkg/file/packages/file' ||
96+
path == 'third_party/pkg/file/packages/file_testing';
97+
});
98+
9399
// Remove any packages with identical names.
94100
final uniqueNames = packages.map((p) => p.name).toSet();
95101

tools/package_deps/bin/package_deps.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,8 @@ class SdkDeps {
453453
_findPackages(Directory('pkg'));
454454
_findPackages(Directory(path.join('third_party', 'devtools')));
455455
_findPackages(Directory(path.join('third_party', 'pkg')));
456+
_findPackages(
457+
Directory(path.join('third_party', 'pkg', 'file', 'packages')));
456458

457459
if (verbose) {
458460
print('Package versions in the SDK:');

0 commit comments

Comments
 (0)