Move rapidjson to flutter/third_party

zanderso · zanderso · commit 42285c9f18f0 · 2023-10-26T14:14:35.000-07:00
diff --git a/DEPS b/DEPS
@@ -264,7 +264,7 @@ allowed_hosts = [
 deps = {
   'src': 'https://github.com/flutter/buildroot.git' + '@' + '5ced4367fee2721f6eda34802dc28b1335637c63',
 
-  'src/third_party/rapidjson':
+  'src/flutter/third_party/rapidjson':
    Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
 
   'src/third_party/harfbuzz':
diff --git a/common/graphics/BUILD.gn b/common/graphics/BUILD.gn
@@ -26,8 +26,8 @@ source_set("graphics") {
     "//flutter/fml",
     "//flutter/shell/common:base64",
     "//flutter/shell/version:version",
+    "//flutter/third_party/rapidjson",
     "//third_party/boringssl",
-    "//third_party/rapidjson",
     "//third_party/skia",
   ]
 
diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
@@ -175,9 +175,9 @@ source_set("ui") {
     "//flutter/impeller/runtime_stage",
     "//flutter/runtime:dart_plugin_registrant",
     "//flutter/runtime:test_font",
+    "//flutter/third_party/rapidjson",
     "//flutter/third_party/tonic",
     "//third_party/dart/runtime/bin:dart_io_api",
-    "//third_party/rapidjson",
     "//third_party/skia",
     "//third_party/zlib:zlib",
   ]
diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn
@@ -92,7 +92,7 @@ source_set("runtime") {
   public_deps = [
     "//flutter/lib/gpu",
     "//flutter/lib/ui",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 
   public_configs = [ "//flutter:config" ]
diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
@@ -130,9 +130,9 @@ source_set("common") {
     ":display",
     ":platform_message_handler",
     "//flutter/shell/version",
+    "//flutter/third_party/rapidjson",
     "//flutter/third_party/tonic",
     "//flutter/third_party/txt",
-    "//third_party/rapidjson",
   ]
 
   deps = [
@@ -258,7 +258,7 @@ if (enable_unittests) {
       "//flutter/lib/ui",
       "//flutter/testing:dart",
       "//flutter/testing:fixture_test",
-      "//third_party/rapidjson",
+      "//flutter/third_party/rapidjson",
       "//third_party/skia",
     ]
 
diff --git a/shell/platform/common/BUILD.gn b/shell/platform/common/BUILD.gn
@@ -130,7 +130,7 @@ source_set("common_cpp") {
 
   public_deps = [
     ":common_cpp_core",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 }
 
diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn
@@ -255,10 +255,10 @@ source_set("ios_test_flutter_mrc") {
     "//flutter/shell/common:common",
     "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
+    "//flutter/third_party/rapidjson",
     "//flutter/third_party/tonic",
     "//flutter/third_party/txt",
     "//third_party/ocmock:ocmock_shared",
-    "//third_party/rapidjson",
     "//third_party/skia",
   ]
 
@@ -327,11 +327,11 @@ shared_library("ios_test_flutter") {
     "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/embedder:embedder_test_utils",
+    "//flutter/third_party/rapidjson",
     "//flutter/third_party/spring_animation",
     "//flutter/third_party/tonic",
     "//flutter/third_party/txt",
     "//third_party/ocmock:ocmock_shared",
-    "//third_party/rapidjson",
     "//third_party/skia",
   ]
   public_configs = [
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn b/shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn
@@ -28,7 +28,7 @@ source_set("focus") {
     "//build/fuchsia/pkg:sys_cpp_testing",
     "//flutter/lib/ui",
     "//flutter/testing",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 }
 
@@ -41,6 +41,6 @@ source_set("pointer") {
     "//build/fuchsia/pkg:sys_cpp_testing",
     "//flutter/lib/ui",
     "//flutter/testing",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 }
diff --git a/shell/platform/glfw/BUILD.gn b/shell/platform/glfw/BUILD.gn
@@ -60,7 +60,7 @@ source_set("flutter_glfw") {
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw",
     "//flutter/third_party/glfw",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 
   if (is_linux) {
diff --git a/shell/platform/linux/BUILD.gn b/shell/platform/linux/BUILD.gn
@@ -163,7 +163,7 @@ source_set("flutter_linux_sources") {
     "//flutter/shell/platform/common:common_cpp_input",
     "//flutter/shell/platform/common:common_cpp_switches",
     "//flutter/shell/platform/embedder:embedder_headers",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 }
 
diff --git a/shell/platform/windows/BUILD.gn b/shell/platform/windows/BUILD.gn
@@ -138,13 +138,13 @@ source_set("flutter_windows_source") {
     "//flutter/shell/platform/common/client_wrapper:client_wrapper",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/windows/client_wrapper:client_wrapper_windows",
+    "//flutter/third_party/rapidjson",
     "//third_party/angle:libEGL_static",  # the order of libEGL_static and
                                           # libGLESv2_static is important.. if
                                           # reversed, will cause a linker error
                                           # DllMain already defined in
                                           # LIBCMTD.lib
     "//third_party/angle:libGLESv2_static",
-    "//third_party/rapidjson",
   ]
 }
 
@@ -238,8 +238,8 @@ executable("flutter_windows_unittests") {
     "//flutter/shell/platform/embedder:embedder_test_utils",
     "//flutter/testing",
     "//flutter/testing:dart",
+    "//flutter/third_party/rapidjson",
     "//flutter/third_party/tonic",
-    "//third_party/rapidjson",
   ]
 }
 
diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart
@@ -1029,6 +1029,8 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
   static final RegExp _licenseNamePattern = RegExp(r'^(?!.*\.py$)(?!.*(?:no|update)-copyright)(?!.*mh-bsd-gcc).*\b_*(?:license(?!\.html)|copying|copyright|notice|l?gpl|GPLv2|bsd|mit|mpl?|ftl|Apache)_*\b', caseSensitive: false);
 
   static const Map<String, _Constructor> _specialCaseFiles = <String, _Constructor>{
+    '/flutter/third_party/rapidjson/LICENSE': _RepositoryOpaqueLicenseFile.new,
+    '/flutter/third_party/rapidjson/license.txt': _RepositoryOpaqueLicenseFile.new,
     '/fuchsia/sdk/linux/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
     '/fuchsia/sdk/mac/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
     '/third_party/boringssl/src/LICENSE': _RepositoryOpenSSLLicenseFile.new,
@@ -1041,8 +1043,6 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
     '/third_party/libjpeg-turbo/LICENSE': _RepositoryLibJpegTurboLicenseFile.new,
     '/third_party/libjpeg-turbo/README.ijg': _RepositoryReadmeIjgFile.new,
     '/third_party/libpng/LICENSE': _RepositoryLibPngLicenseFile.new,
-    '/third_party/rapidjson/LICENSE': _RepositoryOpaqueLicenseFile.new,
-    '/third_party/rapidjson/license.txt': _RepositoryOpaqueLicenseFile.new,
     '/third_party/root_certificates/LICENSE': _RepositoryMpl2File.new,
     '/third_party/vulkan-deps/vulkan-validation-layers/src/LICENSE.txt': _RepositoryVulkanApacheLicenseFile.new,
     '/third_party/inja/third_party/include/nlohmann/json.hpp': _RepositoryInjaJsonFile.new,
diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
@@ -34,6 +34,8 @@ final Set<String> skippedPaths = <String>{
   r'flutter/third_party/gn',
   r'flutter/third_party/imgui',
   r'flutter/third_party/ninja', // build system
+  r'flutter/third_party/rapidjson/contrib', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/rapidjson/doc', // documentation
   r'flutter/third_party/test_shaders', // for tests only
   r'flutter/third_party/txt/third_party/fonts',
   r'flutter/tools',
@@ -160,8 +162,6 @@ final Set<String> skippedPaths = <String>{
   r'third_party/pkg/quiver',
   r'third_party/pkg/vector_math',
   r'third_party/pyyaml', // build-time dependency only
-  r'third_party/rapidjson/contrib', // contains nothing that ends up in the binary executable
-  r'third_party/rapidjson/doc', // documentation
   r'third_party/root_certificates/certdata.pem',
   r'third_party/root_certificates/certdata.txt',
   r'third_party/shaderc/third_party/LICENSE.glslang', // unclear what the purpose of this file is

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ source_set("graphics") {`
`26`	`26`	`"//flutter/fml",`
`27`	`27`	`"//flutter/shell/common:base64",`
`28`	`28`	`"//flutter/shell/version:version",`
	`29`	`+ "//flutter/third_party/rapidjson",`
`29`	`30`	`"//third_party/boringssl",`
`30`		`- "//third_party/rapidjson",`
`31`	`31`	`"//third_party/skia",`
`32`	`32`	`]`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ source_set("runtime") {`
`92`	`92`	`public_deps = [`
`93`	`93`	`"//flutter/lib/gpu",`
`94`	`94`	`"//flutter/lib/ui",`
`95`		`- "//third_party/rapidjson",`
	`95`	`+ "//flutter/third_party/rapidjson",`
`96`	`96`	`]`
`97`	`97`
`98`	`98`	`public_configs = [ "//flutter:config" ]`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ source_set("common_cpp") {`
`130`	`130`
`131`	`131`	`public_deps = [`
`132`	`132`	`":common_cpp_core",`
`133`		`- "//third_party/rapidjson",`
	`133`	`+ "//flutter/third_party/rapidjson",`
`134`	`134`	`]`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ source_set("focus") {`
`28`	`28`	`"//build/fuchsia/pkg:sys_cpp_testing",`
`29`	`29`	`"//flutter/lib/ui",`
`30`	`30`	`"//flutter/testing",`
`31`		`- "//third_party/rapidjson",`
	`31`	`+ "//flutter/third_party/rapidjson",`
`32`	`32`	`]`
`33`	`33`	`}`
`34`	`34`
`@@ -41,6 +41,6 @@ source_set("pointer") {`
`41`	`41`	`"//build/fuchsia/pkg:sys_cpp_testing",`
`42`	`42`	`"//flutter/lib/ui",`
`43`	`43`	`"//flutter/testing",`
`44`		`- "//third_party/rapidjson",`
	`44`	`+ "//flutter/third_party/rapidjson",`
`45`	`45`	`]`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ source_set("flutter_glfw") {`
`60`	`60`	`"//flutter/shell/platform/embedder:embedder_as_internal_library",`
`61`	`61`	`"//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw",`
`62`	`62`	`"//flutter/third_party/glfw",`
`63`		`- "//third_party/rapidjson",`
	`63`	`+ "//flutter/third_party/rapidjson",`
`64`	`64`	`]`
`65`	`65`
`66`	`66`	`if (is_linux) {`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ source_set("flutter_linux_sources") {`
`163`	`163`	`"//flutter/shell/platform/common:common_cpp_input",`
`164`	`164`	`"//flutter/shell/platform/common:common_cpp_switches",`
`165`	`165`	`"//flutter/shell/platform/embedder:embedder_headers",`
`166`		`- "//third_party/rapidjson",`
	`166`	`+ "//flutter/third_party/rapidjson",`
`167`	`167`	`]`
`168`	`168`	`}`
`169`	`169`