Skip to content

Commit 47a710b

Browse files
Move flutter/third_party/txt into flutter/txt (flutter#164248)
The flutter/txt library does not currently contain any third-party code.
1 parent 6da9f78 commit 47a710b

File tree

119 files changed

+814
-1285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+814
-1285
lines changed

engine/src/flutter/.clang-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ CheckOptions:
6060
# updated.
6161
#
6262
# tl;dr: I'm sorry.
63-
HeaderFilterRegex: "[..\/]+\/flutter\/(assets|benchmarking|bin|build|ci|common|display_list|docs|examples|flow|flutter_frontend_server|flutter_vma|fml|impeller|lib|runtime|shell|skia|sky|testing|tools|vulkan|wasm|web_sdk)\/.*"
63+
HeaderFilterRegex: "[..\/]+\/flutter\/(assets|benchmarking|bin|build|ci|common|display_list|docs|examples|flow|flutter_frontend_server|flutter_vma|fml|impeller|lib|runtime|shell|skia|sky|testing|tools|txt|vulkan|wasm|web_sdk)\/.*"

engine/src/flutter/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ group("flutter") {
149149
"//flutter/impeller/geometry:geometry_benchmarks",
150150
"//flutter/lib/ui:ui_benchmarks",
151151
"//flutter/shell/common:shell_benchmarks",
152-
"//flutter/third_party/txt:txt_benchmarks",
152+
"//flutter/txt:txt_benchmarks",
153153
]
154154
}
155155

@@ -200,7 +200,7 @@ group("unittests") {
200200
"//flutter/testing/dart",
201201
"//flutter/testing/smoke_test_failure",
202202
"//flutter/third_party/tonic/tests:tonic_unittests",
203-
"//flutter/third_party/txt:txt_unittests",
203+
"//flutter/txt:txt_unittests",
204204
]
205205

206206
# The accessibility library only supports Mac and Windows at the moment.

engine/src/flutter/ci/builders/linux_host_engine_test.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
"flutter/shell/common:shell_benchmarks",
141141
"flutter/shell/testing",
142142
"flutter/tools/path_ops",
143-
"flutter/third_party/txt:txt_benchmarks"
143+
"flutter/txt:txt_benchmarks"
144144
]
145145
},
146146
"tests": [

engine/src/flutter/ci/builders/standalone/linux_benchmarks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"flutter/lib/ui:ui_benchmarks",
3434
"flutter/shell/common:shell_benchmarks",
3535
"flutter/shell/testing",
36-
"flutter/third_party/txt:txt_benchmarks",
36+
"flutter/txt:txt_benchmarks",
3737
"flutter/tools/path_ops",
3838
"flutter/build/archives:flutter_patched_sdk",
3939
"flutter:unittests"

engine/src/flutter/ci/licenses.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ function verify_licenses() (
183183
echo "double-check that all newly added files have a BSD-style license"
184184
echo "header with the following copyright:"
185185
echo " Copyright 2013 The Flutter Authors. All rights reserved."
186-
echo "Files in 'third_party/txt' may have an Apache license header instead."
187186
echo "If you're absolutely sure that the change in license count is"
188187
echo "intentional, update 'flutter/ci/licenses.sh' with the new count."
189188
echo "================================================================="

engine/src/flutter/ci/licenses_golden/excluded_files

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3030,11 +3030,6 @@
30303030
../../../flutter/third_party/tonic/filesystem/README.md
30313031
../../../flutter/third_party/tonic/filesystem/tests
30323032
../../../flutter/third_party/tonic/tests
3033-
../../../flutter/third_party/txt/.clang-format
3034-
../../../flutter/third_party/txt/.gitattributes
3035-
../../../flutter/third_party/txt/.gitignore
3036-
../../../flutter/third_party/txt/tests
3037-
../../../flutter/third_party/txt/third_party/fonts
30383033
../../../flutter/third_party/vulkan-deps/.git
30393034
../../../flutter/third_party/vulkan-deps/.gitattributes
30403035
../../../flutter/third_party/vulkan-deps/.gitignore
@@ -3322,6 +3317,11 @@
33223317
../../../flutter/tools/licenses/lib/README
33233318
../../../flutter/tools/licenses/pubspec.yaml
33243319
../../../flutter/tools/licenses/test
3320+
../../../flutter/txt/.clang-format
3321+
../../../flutter/txt/.gitattributes
3322+
../../../flutter/txt/.gitignore
3323+
../../../flutter/txt/tests
3324+
../../../flutter/txt/third_party/fonts
33253325
../../../flutter/web_sdk
33263326
../../../fuchsia/sdk/linux/.build-id
33273327
../../../fuchsia/sdk/linux/.versions

engine/src/flutter/ci/licenses_golden/licenses_flutter

Lines changed: 88 additions & 90 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: c84f698d3be586c08f30d61b87c71a64
1+
Signature: 3e70644686476fd49381d86a050498ab
22

engine/src/flutter/display_list/BUILD.gn

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ source_set("display_list") {
141141
}
142142

143143
test_fixtures("display_list_fixtures") {
144-
fixtures =
145-
[ "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf" ]
144+
fixtures = [ "//flutter/txt/third_party/fonts/Roboto-Regular.ttf" ]
146145
}
147146

148147
if (enable_unittests) {
@@ -207,7 +206,7 @@ if (enable_unittests) {
207206
"//flutter/display_list/testing:display_list_testing",
208207
"//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
209208
"//flutter/testing",
210-
"//flutter/third_party/txt",
209+
"//flutter/txt",
211210
]
212211

213212
if (!defined(defines)) {

engine/src/flutter/display_list/testing/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source_set("display_list_testing") {
1717
deps = [
1818
"//flutter/skia",
1919
"//flutter/testing:testing_lib",
20-
"//flutter/third_party/txt",
20+
"//flutter/txt",
2121
]
2222

2323
public_deps = [ "//flutter/display_list:display_list" ]

0 commit comments

Comments
 (0)