From b4649c4e38f89a277297b78fb88052660089baf4 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 12 Apr 2022 02:56:36 +0000
Subject: [PATCH] third_party/json upgrade to 3.9.1

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Iff5e2e7a60c6dbb0378abef8f7ce79f63b5e2b1d
---
 services/distributedfiledaemon/BUILD.gn               | 3 ++-
 services/distributedfiledaemon/test/unittest/BUILD.gn | 4 +++-
 test/moduletest/BUILD.gn                              | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 services/distributedfiledaemon/BUILD.gn

diff --git a/services/distributedfiledaemon/BUILD.gn b/services/distributedfiledaemon/BUILD.gn
old mode 100755
new mode 100644
index 7a2313b34..6cd5642e5
--- a/services/distributedfiledaemon/BUILD.gn
+++ b/services/distributedfiledaemon/BUILD.gn
@@ -18,7 +18,6 @@ ohos_shared_library("libdistributedfiledaemon") {
     "include",
     "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include",
     "//base/security/deviceauth/interfaces/innerkits",
-    "//third_party/json/include",
   ]
 
   sources = [
@@ -42,7 +41,9 @@ ohos_shared_library("libdistributedfiledaemon") {
     "${utils_path}:libdistributedfileutils",
     "//base/security/deviceauth/services:deviceauth_sdk",
     "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//third_party/json:nlohmann_json_static",
   ]
+  ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ]
   external_deps = [
     "dataclassification:data_transit_mgr",
     "dsoftbus_standard:softbus_client",
diff --git a/services/distributedfiledaemon/test/unittest/BUILD.gn b/services/distributedfiledaemon/test/unittest/BUILD.gn
index 94b311b30..c9b71941f 100644
--- a/services/distributedfiledaemon/test/unittest/BUILD.gn
+++ b/services/distributedfiledaemon/test/unittest/BUILD.gn
@@ -22,7 +22,6 @@ config("module_private_config") {
     "${services_path}/distributedfiledaemon/include",
     "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include",
     "//base/security/deviceauth/interfaces/innerkits",
-    "//third_party/json/include",
   ]
 }
 
@@ -43,8 +42,11 @@ ohos_unittest("DeviceManagerAgentTest") {
     "//base/security/deviceauth/services:deviceauth_sdk",
     "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//third_party/googletest:gtest_main",
+    "//third_party/json:nlohmann_json_static",
   ]
 
+  ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ]
+
   external_deps = [
     "dataclassification:data_transit_mgr",
     "dsoftbus_standard:softbus_client",
diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn
index 3c6b63319..beddafdee 100644
--- a/test/moduletest/BUILD.gn
+++ b/test/moduletest/BUILD.gn
@@ -25,7 +25,6 @@ config("module_private_config") {
     "//foundation/communication/dsoftbus/interfaces/kits/bus_center",
     "//foundation/communication/dsoftbus/interfaces/kits/common",
     "//base/security/deviceauth/interfaces/innerkits",
-    "//third_party/json/include",
   ]
 }
 
@@ -65,8 +64,11 @@ ohos_moduletest("DistributedFileDaemonServiceTest") {
     "//foundation/filemanagement/dfs_service/services/distributedfiledaemon:libdistributedfiledaemon",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
+    "//third_party/json:nlohmann_json_static",
   ]
 
+  ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ]
+
   external_deps = [
     "dataclassification:data_transit_mgr",
     "dsoftbus_standard:softbus_client",
-- 
Gitee