[rapidjson] Fix import statements (#6418)

DEPS

@@ -135,7 +135,7 @@ deps = {
    Var('fuchsia_git') + '/third_party/googletest' + '@' + '2072b0053d3537fa5e8d222e34c759987aae1320',
 
   'src/third_party/rapidjson':
-   Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '9defbb0209a534ffeb3a2b79d5ee440a77407292',
+   Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '32d07c55db1bb6c2ae17cba4033491a667647753',
 
   'src/third_party/harfbuzz':
    Var('fuchsia_git') + '/third_party/harfbuzz' + '@' + 'd837034f09a957faf2814002e8ebd81da6151d1b',

ci/licenses_golden/licenses_third_party

-Signature: 251f936d9bd8ced851a73a4413f02e30
+Signature: 557450819efed148f52ea1b142c9d410
 
 UNUSED LICENSES:
 
@@ -15995,41 +15995,42 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: rapidjson
-ORIGIN: ../../../third_party/rapidjson/rapidjson/error/en.h
+ORIGIN: ../../../third_party/rapidjson/include/rapidjson/error/en.h
 TYPE: LicenseType.mit
-FILE: ../../../third_party/rapidjson/rapidjson/allocators.h
-FILE: ../../../third_party/rapidjson/rapidjson/document.h
-FILE: ../../../third_party/rapidjson/rapidjson/encodedstream.h
-FILE: ../../../third_party/rapidjson/rapidjson/encodings.h
-FILE: ../../../third_party/rapidjson/rapidjson/error/en.h
-FILE: ../../../third_party/rapidjson/rapidjson/error/error.h
-FILE: ../../../third_party/rapidjson/rapidjson/filereadstream.h
-FILE: ../../../third_party/rapidjson/rapidjson/filewritestream.h
-FILE: ../../../third_party/rapidjson/rapidjson/fwd.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/biginteger.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/diyfp.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/dtoa.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/ieee754.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/itoa.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/meta.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/pow10.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/regex.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/stack.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/strfunc.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/strtod.h
-FILE: ../../../third_party/rapidjson/rapidjson/internal/swap.h
-FILE: ../../../third_party/rapidjson/rapidjson/istreamwrapper.h
-FILE: ../../../third_party/rapidjson/rapidjson/memorybuffer.h
-FILE: ../../../third_party/rapidjson/rapidjson/memorystream.h
-FILE: ../../../third_party/rapidjson/rapidjson/ostreamwrapper.h
-FILE: ../../../third_party/rapidjson/rapidjson/pointer.h
-FILE: ../../../third_party/rapidjson/rapidjson/prettywriter.h
-FILE: ../../../third_party/rapidjson/rapidjson/rapidjson.h
-FILE: ../../../third_party/rapidjson/rapidjson/reader.h
-FILE: ../../../third_party/rapidjson/rapidjson/schema.h
-FILE: ../../../third_party/rapidjson/rapidjson/stream.h
-FILE: ../../../third_party/rapidjson/rapidjson/stringbuffer.h
-FILE: ../../../third_party/rapidjson/rapidjson/writer.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/allocators.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/cursorstreamwrapper.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/document.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/encodedstream.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/encodings.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/error/en.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/error/error.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/filereadstream.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/filewritestream.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/fwd.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/biginteger.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/diyfp.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/dtoa.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/ieee754.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/itoa.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/meta.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/pow10.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/regex.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/stack.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/strfunc.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/strtod.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/internal/swap.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/istreamwrapper.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/memorybuffer.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/memorystream.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/ostreamwrapper.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/pointer.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/prettywriter.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/rapidjson.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/reader.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/schema.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/stream.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/stringbuffer.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/writer.h
 ----------------------------------------------------------------------------------------------------
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -16040,10 +16041,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ====================================================================================================
 LIBRARY: rapidjson
-ORIGIN: ../../../third_party/rapidjson/rapidjson/msinttypes/inttypes.h
+ORIGIN: ../../../third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/rapidjson/rapidjson/msinttypes/inttypes.h
-FILE: ../../../third_party/rapidjson/rapidjson/msinttypes/stdint.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
+FILE: ../../../third_party/rapidjson/include/rapidjson/msinttypes/stdint.h
 ----------------------------------------------------------------------------------------------------
 Copyright (c) 2006-2013 Alexander Chemeris
 

lib/ui/plugins/callback_cache.cc

@@ -9,9 +9,9 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/paths.h"
 #include "flutter/lib/ui/plugins/callback_cache.h"
-#include "third_party/rapidjson/rapidjson/document.h"
-#include "third_party/rapidjson/rapidjson/stringbuffer.h"
-#include "third_party/rapidjson/rapidjson/writer.h"
+#include "rapidjson/document.h"
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/writer.h"
 #include "third_party/tonic/converter/dart_converter.h"
 
 using rapidjson::Document;

lib/ui/text/font_collection.cc

@@ -8,8 +8,8 @@
 
 #include "flutter/lib/ui/text/asset_manager_font_provider.h"
 #include "flutter/runtime/test_font_data.h"
-#include "third_party/rapidjson/rapidjson/document.h"
-#include "third_party/rapidjson/rapidjson/rapidjson.h"
+#include "rapidjson/document.h"
+#include "rapidjson/rapidjson.h"
 #include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "third_party/skia/include/core/SkStream.h"

runtime/BUILD.gn

@@ -95,11 +95,14 @@ source_set("runtime") {
     "$flutter_root/third_party/txt",
     "//third_party/dart/runtime:dart_api",
     "//third_party/dart/runtime/bin:dart_io_api",
-    "//third_party/rapidjson",
     "//third_party/skia",
     "//third_party/tonic",
   ]
 
+  public_deps = [
+    "//third_party/rapidjson",
+  ]
+
   public_configs = [ "$flutter_root:config" ]
 
   if (flutter_runtime_mode != "release" &&

runtime/service_protocol.h

@@ -15,7 +15,7 @@
 #include "flutter/fml/string_view.h"
 #include "flutter/fml/synchronization/thread_annotations.h"
 #include "flutter/fml/task_runner.h"
-#include "third_party/rapidjson/rapidjson/document.h"
+#include "rapidjson/document.h"
 
 namespace blink {
 

shell/common/BUILD.gn

@@ -100,7 +100,6 @@ source_set("common") {
     "$flutter_root/runtime",
     "$flutter_root/synchronization",
     "//third_party/dart/runtime:dart_api",
-    "//third_party/rapidjson",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]
@@ -109,6 +108,7 @@ source_set("common") {
     "$flutter_root/shell/version",
     "$flutter_root/third_party/txt",
     "//third_party/tonic",
+    "//third_party/rapidjson",
   ]
 
   public_configs = [ "$flutter_root:config" ]

shell/common/engine.cc

@@ -19,7 +19,7 @@
 #include "flutter/shell/common/animator.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/shell.h"
-#include "third_party/rapidjson/rapidjson/document.h"
+#include "rapidjson/document.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"