Skip to content

Commit 35b5aa5

Browse files
switch const finder to package_config (flutter#19576)
Generate package config during gclient runhooks and update BUILD.gn to reference it
1 parent 07d5090 commit 35b5aa5

File tree

3 files changed

+18
-20
lines changed

3 files changed

+18
-20
lines changed

tools/const_finder/.dart_tool/package_config.json

+16-19
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,34 @@
22
"configVersion": 2,
33
"packages": [
44
{
5-
"name": "args",
6-
"rootUri": "../../../../third_party/dart/third_party/pkg/args",
7-
"packageUri": "lib/",
8-
"languageVersion": "2.0"
5+
"name": "const_finder",
6+
"rootUri": "../",
7+
"packageUri": "lib",
8+
"languageVersion": "2.4"
99
},
1010
{
1111
"name": "kernel",
1212
"rootUri": "../../../../third_party/dart/pkg/kernel",
13-
"packageUri": "lib/",
13+
"packageUri": "lib",
1414
"languageVersion": "2.2"
1515
},
1616
{
1717
"name": "meta",
1818
"rootUri": "../../../../third_party/dart/pkg/meta",
19-
"packageUri": "lib/",
20-
"languageVersion": "1.12"
19+
"packageUri": "lib",
20+
"languageVersion": "2.9"
21+
},
22+
{
23+
"name": "args",
24+
"rootUri": "../../../../third_party/dart/third_party/pkg/args",
25+
"packageUri": "lib",
26+
"languageVersion": "2.3"
2127
},
2228
{
2329
"name": "path",
2430
"rootUri": "../../../../third_party/dart/third_party/pkg/path",
25-
"packageUri": "lib/",
31+
"packageUri": "lib",
2632
"languageVersion": "2.0"
27-
},
28-
{
29-
"name": "const_finder",
30-
"rootUri": "../",
31-
"packageUri": "lib/",
32-
"languageVersion": "2.4"
3333
}
34-
],
35-
"generated": "2020-01-16T19:11:54.963296Z",
36-
"generator": "pub",
37-
"generatorVersion": "2.7.0"
38-
}
34+
]
35+
}

tools/const_finder/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import("//third_party/dart/utils/application_snapshot.gni")
66

77
application_snapshot("const_finder") {
88
main_dart = "bin/main.dart"
9-
dot_packages = ".packages"
9+
dot_packages = ".dart_tool/package_config.json"
1010

1111
training_args = [ "--help" ]
1212

tools/run_third_party_dart.py

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
if __name__ == '__main__':
88
subprocess.call(["src/third_party/dart/tools/sdks/dart-sdk/bin/dart", "pub", "global", "activate", "-spath", "./src/flutter/tools/generate_package_config"])
99
subprocess.call(["src/third_party/dart/tools/sdks/dart-sdk/bin/dart", "pub", "global", "run", "generate_package_config:generate_from_legacy", "src/flutter/flutter_frontend_server/.packages"])
10+
subprocess.call(["src/third_party/dart/tools/sdks/dart-sdk/bin/dart", "pub", "global", "run", "generate_package_config:generate_from_legacy", "src/flutter/tools/const_finder/.packages"])

0 commit comments

Comments
 (0)