From ae7481fbe2e7dc86b5dde8be7b90aa23172c2ba1 Mon Sep 17 00:00:00 2001
From: Zachary Bush <zach@zmbush.com>
Date: Wed, 3 Oct 2018 17:33:45 -0700
Subject: [PATCH] [rapidjson] Fix import statements (flutter/engine#6418)

---
 DEPS                                                | 2 +-
 engine/src/flutter/lib/ui/plugins/callback_cache.cc | 6 +++---
 engine/src/flutter/lib/ui/text/font_collection.cc   | 4 ++--
 engine/src/flutter/runtime/BUILD.gn                 | 5 ++++-
 engine/src/flutter/runtime/service_protocol.h       | 2 +-
 engine/src/flutter/shell/common/BUILD.gn            | 2 +-
 engine/src/flutter/shell/common/engine.cc           | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/DEPS b/DEPS
index e2e531e190..0b3ec40a42 100644
--- a/DEPS
+++ b/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',
diff --git a/engine/src/flutter/lib/ui/plugins/callback_cache.cc b/engine/src/flutter/lib/ui/plugins/callback_cache.cc
index 18c370f117..81273d80e0 100644
--- a/engine/src/flutter/lib/ui/plugins/callback_cache.cc
+++ b/engine/src/flutter/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;
diff --git a/engine/src/flutter/lib/ui/text/font_collection.cc b/engine/src/flutter/lib/ui/text/font_collection.cc
index b5a88354cc..6025fb6a93 100644
--- a/engine/src/flutter/lib/ui/text/font_collection.cc
+++ b/engine/src/flutter/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"
diff --git a/engine/src/flutter/runtime/BUILD.gn b/engine/src/flutter/runtime/BUILD.gn
index b5ff2efea4..c4cb72d117 100644
--- a/engine/src/flutter/runtime/BUILD.gn
+++ b/engine/src/flutter/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" &&
diff --git a/engine/src/flutter/runtime/service_protocol.h b/engine/src/flutter/runtime/service_protocol.h
index 9b255d12c3..46a680733d 100644
--- a/engine/src/flutter/runtime/service_protocol.h
+++ b/engine/src/flutter/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 {
 
diff --git a/engine/src/flutter/shell/common/BUILD.gn b/engine/src/flutter/shell/common/BUILD.gn
index 578cb02f47..c2821e2a4b 100644
--- a/engine/src/flutter/shell/common/BUILD.gn
+++ b/engine/src/flutter/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" ]
diff --git a/engine/src/flutter/shell/common/engine.cc b/engine/src/flutter/shell/common/engine.cc
index 2a9ee3f2c0..8f4616ef50 100644
--- a/engine/src/flutter/shell/common/engine.cc
+++ b/engine/src/flutter/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"