Skip to content

Commit 2c5d0c4

Browse files
zmbushchinmaygarde
zmbush
authored and
chinmaygarde
committed
[rapidjson] Fix import statements (flutter#6418)
1 parent c2128fc commit 2c5d0c4

File tree

8 files changed

+52
-48
lines changed

8 files changed

+52
-48
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ deps = {
135135
Var('fuchsia_git') + '/third_party/googletest' + '@' + '2072b0053d3537fa5e8d222e34c759987aae1320',
136136

137137
'src/third_party/rapidjson':
138-
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '9defbb0209a534ffeb3a2b79d5ee440a77407292',
138+
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '32d07c55db1bb6c2ae17cba4033491a667647753',
139139

140140
'src/third_party/harfbuzz':
141141
Var('fuchsia_git') + '/third_party/harfbuzz' + '@' + 'd837034f09a957faf2814002e8ebd81da6151d1b',

‎ci/licenses_golden/licenses_third_party‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 251f936d9bd8ced851a73a4413f02e30
1+
Signature: 557450819efed148f52ea1b142c9d410
22

33
UNUSED LICENSES:
44

@@ -15995,41 +15995,42 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1599515995

1599615996
====================================================================================================
1599715997
LIBRARY: rapidjson
15998-
ORIGIN: ../../../third_party/rapidjson/rapidjson/error/en.h
15998+
ORIGIN: ../../../third_party/rapidjson/include/rapidjson/error/en.h
1599915999
TYPE: LicenseType.mit
16000-
FILE: ../../../third_party/rapidjson/rapidjson/allocators.h
16001-
FILE: ../../../third_party/rapidjson/rapidjson/document.h
16002-
FILE: ../../../third_party/rapidjson/rapidjson/encodedstream.h
16003-
FILE: ../../../third_party/rapidjson/rapidjson/encodings.h
16004-
FILE: ../../../third_party/rapidjson/rapidjson/error/en.h
16005-
FILE: ../../../third_party/rapidjson/rapidjson/error/error.h
16006-
FILE: ../../../third_party/rapidjson/rapidjson/filereadstream.h
16007-
FILE: ../../../third_party/rapidjson/rapidjson/filewritestream.h
16008-
FILE: ../../../third_party/rapidjson/rapidjson/fwd.h
16009-
FILE: ../../../third_party/rapidjson/rapidjson/internal/biginteger.h
16010-
FILE: ../../../third_party/rapidjson/rapidjson/internal/diyfp.h
16011-
FILE: ../../../third_party/rapidjson/rapidjson/internal/dtoa.h
16012-
FILE: ../../../third_party/rapidjson/rapidjson/internal/ieee754.h
16013-
FILE: ../../../third_party/rapidjson/rapidjson/internal/itoa.h
16014-
FILE: ../../../third_party/rapidjson/rapidjson/internal/meta.h
16015-
FILE: ../../../third_party/rapidjson/rapidjson/internal/pow10.h
16016-
FILE: ../../../third_party/rapidjson/rapidjson/internal/regex.h
16017-
FILE: ../../../third_party/rapidjson/rapidjson/internal/stack.h
16018-
FILE: ../../../third_party/rapidjson/rapidjson/internal/strfunc.h
16019-
FILE: ../../../third_party/rapidjson/rapidjson/internal/strtod.h
16020-
FILE: ../../../third_party/rapidjson/rapidjson/internal/swap.h
16021-
FILE: ../../../third_party/rapidjson/rapidjson/istreamwrapper.h
16022-
FILE: ../../../third_party/rapidjson/rapidjson/memorybuffer.h
16023-
FILE: ../../../third_party/rapidjson/rapidjson/memorystream.h
16024-
FILE: ../../../third_party/rapidjson/rapidjson/ostreamwrapper.h
16025-
FILE: ../../../third_party/rapidjson/rapidjson/pointer.h
16026-
FILE: ../../../third_party/rapidjson/rapidjson/prettywriter.h
16027-
FILE: ../../../third_party/rapidjson/rapidjson/rapidjson.h
16028-
FILE: ../../../third_party/rapidjson/rapidjson/reader.h
16029-
FILE: ../../../third_party/rapidjson/rapidjson/schema.h
16030-
FILE: ../../../third_party/rapidjson/rapidjson/stream.h
16031-
FILE: ../../../third_party/rapidjson/rapidjson/stringbuffer.h
16032-
FILE: ../../../third_party/rapidjson/rapidjson/writer.h
16000+
FILE: ../../../third_party/rapidjson/include/rapidjson/allocators.h
16001+
FILE: ../../../third_party/rapidjson/include/rapidjson/cursorstreamwrapper.h
16002+
FILE: ../../../third_party/rapidjson/include/rapidjson/document.h
16003+
FILE: ../../../third_party/rapidjson/include/rapidjson/encodedstream.h
16004+
FILE: ../../../third_party/rapidjson/include/rapidjson/encodings.h
16005+
FILE: ../../../third_party/rapidjson/include/rapidjson/error/en.h
16006+
FILE: ../../../third_party/rapidjson/include/rapidjson/error/error.h
16007+
FILE: ../../../third_party/rapidjson/include/rapidjson/filereadstream.h
16008+
FILE: ../../../third_party/rapidjson/include/rapidjson/filewritestream.h
16009+
FILE: ../../../third_party/rapidjson/include/rapidjson/fwd.h
16010+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/biginteger.h
16011+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/diyfp.h
16012+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/dtoa.h
16013+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/ieee754.h
16014+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/itoa.h
16015+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/meta.h
16016+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/pow10.h
16017+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/regex.h
16018+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/stack.h
16019+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/strfunc.h
16020+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/strtod.h
16021+
FILE: ../../../third_party/rapidjson/include/rapidjson/internal/swap.h
16022+
FILE: ../../../third_party/rapidjson/include/rapidjson/istreamwrapper.h
16023+
FILE: ../../../third_party/rapidjson/include/rapidjson/memorybuffer.h
16024+
FILE: ../../../third_party/rapidjson/include/rapidjson/memorystream.h
16025+
FILE: ../../../third_party/rapidjson/include/rapidjson/ostreamwrapper.h
16026+
FILE: ../../../third_party/rapidjson/include/rapidjson/pointer.h
16027+
FILE: ../../../third_party/rapidjson/include/rapidjson/prettywriter.h
16028+
FILE: ../../../third_party/rapidjson/include/rapidjson/rapidjson.h
16029+
FILE: ../../../third_party/rapidjson/include/rapidjson/reader.h
16030+
FILE: ../../../third_party/rapidjson/include/rapidjson/schema.h
16031+
FILE: ../../../third_party/rapidjson/include/rapidjson/stream.h
16032+
FILE: ../../../third_party/rapidjson/include/rapidjson/stringbuffer.h
16033+
FILE: ../../../third_party/rapidjson/include/rapidjson/writer.h
1603316034
----------------------------------------------------------------------------------------------------
1603416035
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:
1603516036

@@ -16040,10 +16041,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
1604016041

1604116042
====================================================================================================
1604216043
LIBRARY: rapidjson
16043-
ORIGIN: ../../../third_party/rapidjson/rapidjson/msinttypes/inttypes.h
16044+
ORIGIN: ../../../third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
1604416045
TYPE: LicenseType.bsd
16045-
FILE: ../../../third_party/rapidjson/rapidjson/msinttypes/inttypes.h
16046-
FILE: ../../../third_party/rapidjson/rapidjson/msinttypes/stdint.h
16046+
FILE: ../../../third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
16047+
FILE: ../../../third_party/rapidjson/include/rapidjson/msinttypes/stdint.h
1604716048
----------------------------------------------------------------------------------------------------
1604816049
Copyright (c) 2006-2013 Alexander Chemeris
1604916050

‎lib/ui/plugins/callback_cache.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#include "flutter/fml/logging.h"
1010
#include "flutter/fml/paths.h"
1111
#include "flutter/lib/ui/plugins/callback_cache.h"
12-
#include "third_party/rapidjson/rapidjson/document.h"
13-
#include "third_party/rapidjson/rapidjson/stringbuffer.h"
14-
#include "third_party/rapidjson/rapidjson/writer.h"
12+
#include "rapidjson/document.h"
13+
#include "rapidjson/stringbuffer.h"
14+
#include "rapidjson/writer.h"
1515
#include "third_party/tonic/converter/dart_converter.h"
1616

1717
using rapidjson::Document;

‎lib/ui/text/font_collection.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
#include "flutter/lib/ui/text/asset_manager_font_provider.h"
1010
#include "flutter/runtime/test_font_data.h"
11-
#include "third_party/rapidjson/rapidjson/document.h"
12-
#include "third_party/rapidjson/rapidjson/rapidjson.h"
11+
#include "rapidjson/document.h"
12+
#include "rapidjson/rapidjson.h"
1313
#include "third_party/skia/include/core/SkFontMgr.h"
1414
#include "third_party/skia/include/core/SkGraphics.h"
1515
#include "third_party/skia/include/core/SkStream.h"

‎runtime/BUILD.gn‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,14 @@ source_set("runtime") {
9595
"$flutter_root/third_party/txt",
9696
"//third_party/dart/runtime:dart_api",
9797
"//third_party/dart/runtime/bin:dart_io_api",
98-
"//third_party/rapidjson",
9998
"//third_party/skia",
10099
"//third_party/tonic",
101100
]
102101

102+
public_deps = [
103+
"//third_party/rapidjson",
104+
]
105+
103106
public_configs = [ "$flutter_root:config" ]
104107

105108
if (flutter_runtime_mode != "release" &&

‎runtime/service_protocol.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "flutter/fml/string_view.h"
1616
#include "flutter/fml/synchronization/thread_annotations.h"
1717
#include "flutter/fml/task_runner.h"
18-
#include "third_party/rapidjson/rapidjson/document.h"
18+
#include "rapidjson/document.h"
1919

2020
namespace blink {
2121

‎shell/common/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ source_set("common") {
100100
"$flutter_root/runtime",
101101
"$flutter_root/synchronization",
102102
"//third_party/dart/runtime:dart_api",
103-
"//third_party/rapidjson",
104103
"//third_party/skia",
105104
"//third_party/skia:gpu",
106105
]
@@ -109,6 +108,7 @@ source_set("common") {
109108
"$flutter_root/shell/version",
110109
"$flutter_root/third_party/txt",
111110
"//third_party/tonic",
111+
"//third_party/rapidjson",
112112
]
113113

114114
public_configs = [ "$flutter_root:config" ]

‎shell/common/engine.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "flutter/shell/common/animator.h"
2020
#include "flutter/shell/common/platform_view.h"
2121
#include "flutter/shell/common/shell.h"
22-
#include "third_party/rapidjson/rapidjson/document.h"
22+
#include "rapidjson/document.h"
2323
#include "third_party/skia/include/core/SkCanvas.h"
2424
#include "third_party/skia/include/core/SkPictureRecorder.h"
2525

0 commit comments

Comments
 (0)