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

Commit 5176c81

Browse files
zandersozanderso
authored
Move rapidjson to flutter/third_party (#47354)
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 674de5b commit 5176c81

File tree

18 files changed

+192
-192
lines changed

18 files changed

+192
-192
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ allowed_hosts = [
264264
deps = {
265265
'src': 'https://github.com/flutter/buildroot.git' + '@' + '5ced4367fee2721f6eda34802dc28b1335637c63',
266266

267-
'src/third_party/rapidjson':
267+
'src/flutter/third_party/rapidjson':
268268
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
269269

270270
'src/third_party/harfbuzz':

‎ci/licenses.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function verify_licenses() (
156156

157157
local actualLicenseCount
158158
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
159-
local expectedLicenseCount=39 # When changing this number: Update the error message below as well describing the newly expected license types.
159+
local expectedLicenseCount=43 # When changing this number: Update the error message below as well describing the newly expected license types.
160160

161161
if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
162162
echo "=============================== ERROR ==============================="

‎ci/licenses_golden/excluded_files‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,31 @@
446446
../../../flutter/third_party/gn
447447
../../../flutter/third_party/imgui
448448
../../../flutter/third_party/ninja
449+
../../../flutter/third_party/rapidjson/.git
450+
../../../flutter/third_party/rapidjson/.gitattributes
451+
../../../flutter/third_party/rapidjson/.gitignore
452+
../../../flutter/third_party/rapidjson/.gitmodules
453+
../../../flutter/third_party/rapidjson/.travis.yml
454+
../../../flutter/third_party/rapidjson/CHANGELOG.md
455+
../../../flutter/third_party/rapidjson/CMakeLists.txt
456+
../../../flutter/third_party/rapidjson/CMakeModules/FindGTestSrc.cmake
457+
../../../flutter/third_party/rapidjson/README.fuchsia
458+
../../../flutter/third_party/rapidjson/README.fuchsia.md
459+
../../../flutter/third_party/rapidjson/RapidJSON.pc.in
460+
../../../flutter/third_party/rapidjson/RapidJSONConfig.cmake.in
461+
../../../flutter/third_party/rapidjson/RapidJSONConfigVersion.cmake.in
462+
../../../flutter/third_party/rapidjson/appveyor.yml
463+
../../../flutter/third_party/rapidjson/contrib
464+
../../../flutter/third_party/rapidjson/doc
465+
../../../flutter/third_party/rapidjson/docker/debian/Dockerfile
466+
../../../flutter/third_party/rapidjson/example
467+
../../../flutter/third_party/rapidjson/include_dirs.js
468+
../../../flutter/third_party/rapidjson/library.json
469+
../../../flutter/third_party/rapidjson/package.json
470+
../../../flutter/third_party/rapidjson/rapidjson.autopkg
471+
../../../flutter/third_party/rapidjson/readme.md
472+
../../../flutter/third_party/rapidjson/readme.zh-cn.md
473+
../../../flutter/third_party/rapidjson/test
449474
../../../flutter/third_party/spring_animation/README.md
450475
../../../flutter/third_party/test_shaders
451476
../../../flutter/third_party/tonic/.clang-format
@@ -2570,31 +2595,6 @@
25702595
../../../third_party/pkg/vector_math
25712596
../../../third_party/protobuf
25722597
../../../third_party/pyyaml
2573-
../../../third_party/rapidjson/.git
2574-
../../../third_party/rapidjson/.gitattributes
2575-
../../../third_party/rapidjson/.gitignore
2576-
../../../third_party/rapidjson/.gitmodules
2577-
../../../third_party/rapidjson/.travis.yml
2578-
../../../third_party/rapidjson/CHANGELOG.md
2579-
../../../third_party/rapidjson/CMakeLists.txt
2580-
../../../third_party/rapidjson/CMakeModules/FindGTestSrc.cmake
2581-
../../../third_party/rapidjson/README.fuchsia
2582-
../../../third_party/rapidjson/README.fuchsia.md
2583-
../../../third_party/rapidjson/RapidJSON.pc.in
2584-
../../../third_party/rapidjson/RapidJSONConfig.cmake.in
2585-
../../../third_party/rapidjson/RapidJSONConfigVersion.cmake.in
2586-
../../../third_party/rapidjson/appveyor.yml
2587-
../../../third_party/rapidjson/contrib
2588-
../../../third_party/rapidjson/doc
2589-
../../../third_party/rapidjson/docker/debian/Dockerfile
2590-
../../../third_party/rapidjson/example
2591-
../../../third_party/rapidjson/include_dirs.js
2592-
../../../third_party/rapidjson/library.json
2593-
../../../third_party/rapidjson/package.json
2594-
../../../third_party/rapidjson/rapidjson.autopkg
2595-
../../../third_party/rapidjson/readme.md
2596-
../../../third_party/rapidjson/readme.zh-cn.md
2597-
../../../third_party/rapidjson/test
25982598
../../../third_party/root_certificates/.git
25992599
../../../third_party/root_certificates/README.google
26002600
../../../third_party/root_certificates/certdata.pem

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 144 additions & 1 deletion
Large diffs are not rendered by default.

‎ci/licenses_golden/licenses_third_party‎

Lines changed: 2 additions & 145 deletions
Large diffs are not rendered by default.

‎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: f161ef7a408768b3ded7494d69263d9b
1+
Signature: 126031993535612b0d5b22f7793aa786
22

‎common/graphics/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ source_set("graphics") {
2626
"//flutter/fml",
2727
"//flutter/shell/common:base64",
2828
"//flutter/shell/version:version",
29+
"//flutter/third_party/rapidjson",
2930
"//third_party/boringssl",
30-
"//third_party/rapidjson",
3131
"//third_party/skia",
3232
]
3333

‎lib/ui/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ source_set("ui") {
175175
"//flutter/impeller/runtime_stage",
176176
"//flutter/runtime:dart_plugin_registrant",
177177
"//flutter/runtime:test_font",
178+
"//flutter/third_party/rapidjson",
178179
"//flutter/third_party/tonic",
179180
"//third_party/dart/runtime/bin:dart_io_api",
180-
"//third_party/rapidjson",
181181
"//third_party/skia",
182182
"//third_party/zlib:zlib",
183183
]

‎runtime/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ source_set("runtime") {
9292
public_deps = [
9393
"//flutter/lib/gpu",
9494
"//flutter/lib/ui",
95-
"//third_party/rapidjson",
95+
"//flutter/third_party/rapidjson",
9696
]
9797

9898
public_configs = [ "//flutter:config" ]

‎shell/common/BUILD.gn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ source_set("common") {
130130
":display",
131131
":platform_message_handler",
132132
"//flutter/shell/version",
133+
"//flutter/third_party/rapidjson",
133134
"//flutter/third_party/tonic",
134135
"//flutter/third_party/txt",
135-
"//third_party/rapidjson",
136136
]
137137

138138
deps = [
@@ -258,7 +258,7 @@ if (enable_unittests) {
258258
"//flutter/lib/ui",
259259
"//flutter/testing:dart",
260260
"//flutter/testing:fixture_test",
261-
"//third_party/rapidjson",
261+
"//flutter/third_party/rapidjson",
262262
"//third_party/skia",
263263
]
264264

0 commit comments

Comments
 (0)