Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 461d815

Browse files
authored
Move some Dart packages to //flutter/third_party/pkg (#47654)
As part of eliminating the Flutter buildroot (flutter/flutter#67373), we are moving all third-party dependencies from //third_party to //flutter/third_party. Once all third-party dependencies have been migrated, tooling and config will be moved and the buildroot will be eliminated altogether. No tests changed because there is no semantic change to this PR. This is simply relocating a dependency.
1 parent bdfa8aa commit 461d815

File tree

18 files changed

+65
-67
lines changed

18 files changed

+65
-67
lines changed

DEPS

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -682,31 +682,31 @@ deps = {
682682
Var('flutter_git') + '/third_party/abseil-cpp.git' + '@' + '61833f2c057a2b1993d871e8c51156aed1dd4354',
683683

684684
# Dart packages
685-
'src/third_party/pkg/archive':
685+
'src/flutter/third_party/pkg/archive':
686686
Var('github_git') + '/brendan-duncan/archive.git' + '@' + '9de7a0544457c6aba755ccb65abb41b0dc1db70d', # 3.1.2
687687

688-
'src/third_party/pkg/equatable':
688+
'src/flutter/third_party/pkg/equatable':
689689
Var('github_git') + '/felangel/equatable.git' + '@' + '2117551ff3054f8edb1a58f63ffe1832a8d25623', # 2.0.5
690690

691-
'src/third_party/pkg/flutter_packages':
691+
'src/flutter/third_party/pkg/flutter_packages':
692692
Var('flutter_git') + '/mirrors/packages' + '@' + '25454e63851fe7933f04d025606e68c1eac4fe0f', # various
693693

694-
'src/third_party/pkg/gcloud':
694+
'src/flutter/third_party/pkg/gcloud':
695695
Var('github_git') + '/dart-lang/gcloud.git' + '@' + 'a5276b85c4714378e84b1fb478b8feeeb686ac26', # 0.8.6-dev
696696

697-
'src/third_party/pkg/googleapis':
697+
'src/flutter/third_party/pkg/googleapis':
698698
Var('github_git') + '/google/googleapis.dart.git' + '@' + '526011f56d98eab183cc6075ee1392e8303e43e2', # various
699699

700-
'src/third_party/pkg/platform':
700+
'src/flutter/third_party/pkg/platform':
701701
Var('dart_git') + '/platform.dart' + '@' + '1ffad63428bbd1b3ecaa15926bacfb724023648c', # 3.1.0
702702

703-
'src/third_party/pkg/process':
703+
'src/flutter/third_party/pkg/process':
704704
Var('dart_git') + '/process.dart' + '@' + '0c9aeac86dcc4e3a6cf760b76fed507107e244d5', # 4.2.1
705705

706-
'src/third_party/pkg/process_runner':
706+
'src/flutter/third_party/pkg/process_runner':
707707
Var('github_git') + '/google/process_runner.git' + '@' + 'f24c69efdcaf109168f23d381fa281453d2bc9b1', # 4.1.2
708708

709-
'src/third_party/pkg/vector_math':
709+
'src/flutter/third_party/pkg/vector_math':
710710
Var('dart_git') + '/external/github.com/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0
711711

712712
'src/flutter/third_party/imgui':

ci/licenses_golden/excluded_files

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,15 @@
542542
../../../flutter/third_party/libtess2/README.md
543543
../../../flutter/third_party/libtess2/alg_outline.md
544544
../../../flutter/third_party/ninja
545+
../../../flutter/third_party/pkg/archive
546+
../../../flutter/third_party/pkg/equatable
547+
../../../flutter/third_party/pkg/flutter_packages
548+
../../../flutter/third_party/pkg/gcloud
549+
../../../flutter/third_party/pkg/googleapis
550+
../../../flutter/third_party/pkg/platform
551+
../../../flutter/third_party/pkg/process
552+
../../../flutter/third_party/pkg/process_runner
553+
../../../flutter/third_party/pkg/vector_math
545554
../../../flutter/third_party/rapidjson/.git
546555
../../../flutter/third_party/rapidjson/.gitattributes
547556
../../../flutter/third_party/rapidjson/.gitignore
@@ -2640,15 +2649,6 @@
26402649
../../../third_party/perfetto/ui/src/plugins/dev.perfetto.AndroidPerf/OWNERS
26412650
../../../third_party/perfetto/ui/src/plugins/dev.perfetto.LargeScreensPerf/OWNERS
26422651
../../../third_party/perfetto/ui/src/test
2643-
../../../third_party/pkg/archive
2644-
../../../third_party/pkg/equatable
2645-
../../../third_party/pkg/flutter_packages
2646-
../../../third_party/pkg/gcloud
2647-
../../../third_party/pkg/googleapis
2648-
../../../third_party/pkg/platform
2649-
../../../third_party/pkg/process
2650-
../../../third_party/pkg/process_runner
2651-
../../../third_party/pkg/vector_math
26522652
../../../third_party/protobuf
26532653
../../../third_party/pyyaml
26542654
../../../third_party/root_certificates/.git

ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 58eabd70bbf9797956ee94d042df857d
1+
Signature: 69d986a7b2275b798b574b6aea2c1b78
22

ci/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ dependency_overrides:
4848
path:
4949
path: ../../third_party/dart/third_party/pkg/path
5050
platform:
51-
path: ../../third_party/pkg/platform
51+
path: ../third_party/pkg/platform
5252
process:
53-
path: ../../third_party/pkg/process
53+
path: ../third_party/pkg/process
5454
process_runner:
55-
path: ../../third_party/pkg/process_runner
55+
path: ../third_party/pkg/process_runner
5656
smith:
5757
path: ../../third_party/dart/pkg/smith

impeller/golden_tests_harvester/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ dependency_overrides:
3535
path:
3636
path: ../../../third_party/dart/third_party/pkg/path
3737
platform:
38-
path: ../../../third_party/pkg/platform
38+
path: ../../third_party/pkg/platform
3939
process:
40-
path: ../../../third_party/pkg/process
40+
path: ../../third_party/pkg/process
4141
typed_data:
4242
path: ../../../third_party/dart/third_party/pkg/typed_data

shell/platform/fuchsia/dart/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ dart_library("quiver") {
364364
}
365365

366366
dart_library("vector_math") {
367-
package_root = "//third_party/pkg/vector_math"
367+
package_root = "//flutter/third_party/pkg/vector_math"
368368
package_name = "vector_math"
369369

370370
pubspec = "$package_root/pubspec.yaml"

testing/benchmark/pubspec.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dev_dependencies:
2626

2727
dependency_overrides:
2828
_discoveryapis_commons:
29-
path: ../../../third_party/pkg/googleapis/discoveryapis_commons
29+
path: ../../third_party/pkg/googleapis/discoveryapis_commons
3030
args:
3131
path: ../../../third_party/dart/third_party/pkg/args
3232
async_helper:
@@ -40,15 +40,15 @@ dependency_overrides:
4040
crypto :
4141
path: ../../../third_party/dart/third_party/pkg/crypto
4242
equatable:
43-
path: ../../../third_party/pkg/equatable
43+
path: ../../third_party/pkg/equatable
4444
expect:
4545
path: ../../../third_party/dart/pkg/expect
4646
gcloud:
47-
path: ../../../third_party/pkg/gcloud
47+
path: ../../third_party/pkg/gcloud
4848
googleapis:
49-
path: ../../../third_party/pkg/googleapis/generated/googleapis
49+
path: ../../third_party/pkg/googleapis/generated/googleapis
5050
googleapis_auth:
51-
path: ../../../third_party/pkg/googleapis/googleapis_auth
51+
path: ../../third_party/pkg/googleapis/googleapis_auth
5252
http:
5353
path: ../../../third_party/dart/third_party/pkg/http/pkgs/http
5454
http_parser:
@@ -60,7 +60,7 @@ dependency_overrides:
6060
meta:
6161
path: ../../../third_party/dart/pkg/meta
6262
metrics_center:
63-
path: ../../../third_party/pkg/flutter_packages/packages/metrics_center
63+
path: ../../third_party/pkg/flutter_packages/packages/metrics_center
6464
path:
6565
path: ../../../third_party/dart/third_party/pkg/path
6666
smith:

testing/dart/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ dependency_overrides:
4747
path:
4848
path: ../../../third_party/dart/third_party/pkg/path
4949
platform:
50-
path: ../../../third_party/pkg/platform
50+
path: ../../third_party/pkg/platform
5151
process:
52-
path: ../../../third_party/pkg/process
52+
path: ../../third_party/pkg/process
5353
protobuf:
5454
path: ../../../third_party/dart/third_party/pkg/protobuf/protobuf
5555
smith:
@@ -61,7 +61,7 @@ dependency_overrides:
6161
typed_data:
6262
path: ../../../third_party/dart/third_party/pkg/typed_data
6363
vector_math:
64-
path: ../../../third_party/pkg/vector_math
64+
path: ../../third_party/pkg/vector_math
6565
vm_service:
6666
path: ../../../third_party/dart/pkg/vm_service
6767
vm_service_protos:

testing/scenario_app/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ dependency_overrides:
3838
path:
3939
path: ../../../third_party/dart/third_party/pkg/path
4040
platform:
41-
path: ../../../third_party/pkg/platform
41+
path: ../../third_party/pkg/platform
4242
process:
43-
path: ../../../third_party/pkg/process
43+
path: ../../third_party/pkg/process
4444
skia_gold_client:
4545
path: ../../testing/skia_gold_client
4646
sky_engine:
4747
path: ../../sky/packages/sky_engine
4848
typed_data:
4949
path: ../../../third_party/dart/third_party/pkg/typed_data
5050
vector_math:
51-
path: ../../../third_party/pkg/vector_math
51+
path: ../../third_party/pkg/vector_math

testing/skia_gold_client/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ dependency_overrides:
3434
path:
3535
path: ../../../third_party/dart/third_party/pkg/path
3636
platform:
37-
path: ../../../third_party/pkg/platform
37+
path: ../../third_party/pkg/platform
3838
process:
39-
path: ../../../third_party/pkg/process
39+
path: ../../third_party/pkg/process
4040
typed_data:
4141
path: ../../../third_party/dart/third_party/pkg/typed_data

tools/android_lint/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ dependency_overrides:
3030
path:
3131
path: ../../../third_party/dart/third_party/pkg/path
3232
platform:
33-
path: ../../../third_party/pkg/platform
33+
path: ../../third_party/pkg/platform
3434
process:
35-
path: ../../../third_party/pkg/process
35+
path: ../../third_party/pkg/process

tools/clang_tidy/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ dependency_overrides:
5656
path:
5757
path: ../../../third_party/dart/third_party/pkg/path
5858
platform:
59-
path: ../../../third_party/pkg/platform
59+
path: ../../third_party/pkg/platform
6060
process:
61-
path: ../../../third_party/pkg/process
61+
path: ../../third_party/pkg/process
6262
process_fakes:
6363
path: ../pkg/process_fakes
6464
process_runner:
65-
path: ../../../third_party/pkg/process_runner
65+
path: ../../third_party/pkg/process_runner
6666
smith:
6767
path: ../../../third_party/dart/pkg/smith

tools/githooks/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ dependency_overrides:
5454
path:
5555
path: ../../../third_party/dart/third_party/pkg/path
5656
platform:
57-
path: ../../../third_party/pkg/platform
57+
path: ../../third_party/pkg/platform
5858
process:
59-
path: ../../../third_party/pkg/process
59+
path: ../../third_party/pkg/process
6060
process_runner:
61-
path: ../../../third_party/pkg/process_runner
61+
path: ../../third_party/pkg/process_runner
6262
smith:
6363
path: ../../../third_party/dart/pkg/smith

tools/licenses/lib/paths.dart

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ final Set<String> skippedPaths = <String>{
4444
r'flutter/third_party/gn',
4545
r'flutter/third_party/imgui',
4646
r'flutter/third_party/ninja', // build system
47+
r'flutter/third_party/pkg/archive', // contains nothing that ends up in the binary executable
48+
r'flutter/third_party/pkg/equatable',
49+
r'flutter/third_party/pkg/flutter_packages',
50+
r'flutter/third_party/pkg/gcloud',
51+
r'flutter/third_party/pkg/googleapis',
52+
r'flutter/third_party/pkg/platform',
53+
r'flutter/third_party/pkg/process',
54+
r'flutter/third_party/pkg/process_runner',
55+
r'flutter/third_party/pkg/vector_math',
4756
r'flutter/third_party/rapidjson/contrib', // contains nothing that ends up in the binary executable
4857
r'flutter/third_party/rapidjson/doc', // documentation
4958
r'flutter/third_party/shaderc/third_party/LICENSE.glslang', // unclear what the purpose of this file is
@@ -152,17 +161,6 @@ final Set<String> skippedPaths = <String>{
152161
r'third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
153162
r'third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
154163
r'third_party/protobuf', // build-time dependency only
155-
r'third_party/pkg/archive', // contains nothing that ends up in the binary executable
156-
r'third_party/pkg/equatable',
157-
r'third_party/pkg/file',
158-
r'third_party/pkg/flutter_packages',
159-
r'third_party/pkg/gcloud',
160-
r'third_party/pkg/googleapis',
161-
r'third_party/pkg/platform',
162-
r'third_party/pkg/process',
163-
r'third_party/pkg/process_runner',
164-
r'third_party/pkg/quiver',
165-
r'third_party/pkg/vector_math',
166164
r'third_party/pyyaml', // build-time dependency only
167165
r'third_party/root_certificates/certdata.pem',
168166
r'third_party/root_certificates/certdata.txt',

tools/licenses/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dev_dependencies:
3030

3131
dependency_overrides:
3232
archive:
33-
path: ../../../third_party/pkg/archive
33+
path: ../../third_party/pkg/archive
3434
args:
3535
path: ../../../third_party/dart/third_party/pkg/args
3636
async_helper:

tools/pkg/engine_build_configs/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ dependency_overrides:
5252
path:
5353
path: ../../../../third_party/dart/third_party/pkg/path
5454
platform:
55-
path: ../../../../third_party/pkg/platform
55+
path: ../../../third_party/pkg/platform
5656
process:
57-
path: ../../../../third_party/pkg/process
57+
path: ../../../third_party/pkg/process
5858
process_runner:
59-
path: ../../../../third_party/pkg/process_runner
59+
path: ../../../third_party/pkg/process_runner
6060
smith:
6161
path: ../../../../third_party/dart/pkg/smith

tools/pkg/git_repo_tools/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ dependency_overrides:
4949
path:
5050
path: ../../../../third_party/dart/third_party/pkg/path
5151
platform:
52-
path: ../../../../third_party/pkg/platform
52+
path: ../../../third_party/pkg/platform
5353
process:
54-
path: ../../../../third_party/pkg/process
54+
path: ../../../third_party/pkg/process
5555
process_fakes:
5656
path: ../process_fakes
5757
process_runner:
58-
path: ../../../../third_party/pkg/process_runner
58+
path: ../../../third_party/pkg/process_runner
5959
smith:
6060
path: ../../../../third_party/dart/pkg/smith

tools/pkg/process_fakes/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ dependency_overrides:
3131
path:
3232
path: ../../../../third_party/dart/third_party/pkg/path
3333
platform:
34-
path: ../../../../third_party/pkg/platform
34+
path: ../../../third_party/pkg/platform
3535
process:
36-
path: ../../../../third_party/pkg/process
36+
path: ../../../third_party/pkg/process

0 commit comments

Comments
 (0)