Removing rapidjson brave fork

New clang version have been triggering warnings on the forked version of
rapidjson being used by brave. There's work under way to remove
rapidjson entirely from the codebase, but that has proven to be a bit
more challanged than initially expected.

This change removes the use of the rapidjson brave fork, which was
created mainly to have a .gn file in the root path, and uses the
original rapidjson repo to clone it from.

.gitignore

@@ -19,6 +19,7 @@ patches/**/*.patchinfo
 /third_party/argon2/src
 /third_party/ethash/src
 /third_party/bitcoin-core/src
+/third_party/rapidjson/src
 /third_party/rust/cxx
 *.xcodeproj
 *.swp

DEPS

@@ -14,7 +14,6 @@ deps = {
     "url": "https://github.com/brave/Sparkle.git@f69ba7b7fae7dda475ba6cda12fba8d72270478d",
     "condition": "checkout_mac",
   },
-  "vendor/bat-native-rapidjson": "https://github.com/brave-intl/bat-native-rapidjson.git@60b7e4574cebdd79f441bdd6f0f3ab469fd7e04c",
   "vendor/bip39wally-core-native": "https://github.com/brave-intl/bat-native-bip39wally-core.git@0d3a8713a2b388d2156fe49a70ef3f7cdb44b190",
   "vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@800f9d40b7409239ff192e0be634764e747c7a75",
   "vendor/challenge_bypass_ristretto_ffi": "https://github.com/brave-intl/challenge-bypass-ristretto-ffi.git@419995e4a873c294f1eaefca276f8ad25328e89f",
@@ -23,6 +22,7 @@ deps = {
   "third_party/ethash/src": "https://github.com/chfast/ethash.git@e4a15c3d76dc09392c7efd3e30d84ee3b871e9ce",
   "third_party/bitcoin-core/src": "https://github.com/bitcoin/bitcoin.git@95ea54ba089610019a74c1176a2c7c0dba144b1c",
   "third_party/argon2/src": "https://github.com/P-H-C/phc-winner-argon2.git@62358ba2123abd17fccf2a108a301d4b52c01a7c",
+  "third_party/rapidjson/src": "https://github.com/Tencent/rapidjson.git@06d58b9e848c650114556a23294d0b6440078c61",
 }
 
 recursedeps = [

components/brave_ads/test/BUILD.gn

@@ -457,9 +457,9 @@ source_set("brave_ads_unit_tests") {
     "//brave/components/l10n/common",
     "//brave/components/l10n/common:test_support",
     "//brave/components/version_info:version_info",
+    "//brave/third_party/rapidjson",
     "//brave/vendor/bat-native-ads",
     "//brave/vendor/bat-native-ledger",
-    "//brave/vendor/bat-native-rapidjson",
     "//brave/vendor/bat-native-tweetnacl:tweetnacl",
     "//chrome/browser:browser",
     "//chrome/browser/profiles:profile",

components/brave_rewards/test/BUILD.gn

@@ -26,9 +26,9 @@ source_set("brave_rewards_unit_tests") {
     "//brave/components/challenge_bypass_ristretto",
     "//brave/components/greaselion/browser/buildflags:buildflags",
     "//brave/components/l10n/common:test_support",
+    "//brave/third_party/rapidjson",
     "//brave/vendor/bat-native-ledger",
     "//brave/vendor/bat-native-ledger:publishers_proto",
-    "//brave/vendor/bat-native-rapidjson",
     "//chrome/browser:browser",
     "//chrome/browser/profiles:profile",
     "//chrome/test:test_support",

script/brave_license_helper.py

@@ -38,12 +38,6 @@ def AddBraveCredits(prune_paths, special_cases, prune_dirs, additional_paths):
     # Add the licensing info that would normally be in a README.chromium file.
     # This is for when we pull in external repos directly.
     special_cases.update({
-        os.path.join('brave', 'vendor', 'bat-native-rapidjson'): {
-            "Name": "RapidJSON",
-            "URL": "https://github.com/brave-intl/bat-native-rapidjson",
-            "License": "MIT",
-            "License File": "/brave/vendor/bat-native-rapidjson/license.txt",
-        },
         os.path.join('brave', 'vendor', 'bat-native-tweetnacl'): {
             "Name": "TweetNaCl",
             "URL": "https://github.com/brave-intl/bat-native-tweetnacl",
@@ -109,6 +103,12 @@ def AddBraveCredits(prune_paths, special_cases, prune_dirs, additional_paths):
             "License": "BSD",
             "License File": "/brave/vendor/omaha/third_party/libzip/LICENSE",
         },
+        os.path.join('brave', 'third_party', 'rapidjson'): {
+            "Name": "RapidJSON",
+            "URL": "https://github.com/Tencent/rapidjson",
+            "License": "MIT",
+            "License File": "/brave/third_party/rapidjson/src/license.txt",
+        },
         os.path.join('brave', 'vendor', 'omaha', 'third_party', 'zlib'): {
             "Name": "zlib",
             "URL": "https://zlib.net",

third_party/rapidjson/BUILD.gn

@@ -0,0 +1,16 @@
+# Copyright (c) 2022 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/
+
+if (is_android) {
+  import("//build/config/android/rules.gni")
+}
+
+config("external_config") {
+  include_dirs = [ "src/include" ]
+}
+
+source_set("rapidjson") {
+  public_configs = [ ":external_config" ]
+}

vendor/bat-native-ads/BUILD.gn

@@ -1223,10 +1223,10 @@ source_set("ads") {
     "//sql",
     "//third_party/abseil-cpp:absl",
     "//third_party/boringssl",
+    "//brave/third_party/rapidjson",
     "//third_party/re2",
     "//third_party/zlib",
     "//url",
-    rebase_path("bat-native-rapidjson", dep_base),
     rebase_path("bat-native-tweetnacl:tweetnacl", dep_base),
     rebase_path("brave_base", dep_base),
   ]

vendor/bat-native-ledger/BUILD.gn

@@ -595,11 +595,11 @@ source_set("ledger") {
     "//third_party/boringssl",
     "//third_party/brotli:dec",
     "//third_party/protobuf:protobuf_lite",
+    "//brave/third_party/rapidjson",
     "//third_party/re2",
     "//url",
     rebase_path("bip39wally-core-native:bip39wally-core", dep_base),
     rebase_path("bat-native-tweetnacl:tweetnacl", dep_base),
-    rebase_path("bat-native-rapidjson", dep_base),
     rebase_path("brave_base", dep_base),
   ]
 

vendor/bat-native-ledger/test/BUILD.gn

@@ -120,9 +120,9 @@ source_set("bat_native_ledger_tests") {
   deps = [
     "//base/test:test_support",
     "//brave/components/challenge_bypass_ristretto",
+    "//brave/third_party/rapidjson",
     "//brave/vendor/bat-native-ledger",
     "//brave/vendor/bat-native-ledger:publishers_proto",
-    "//brave/vendor/bat-native-rapidjson",
     "//net:net",
     "//sql:sql",
     "//url:url",