From ba098887794b9e5959f50d24ed16f81e21075eb3 Mon Sep 17 00:00:00 2001
From: zero-cyc <chenlien@huawei.com>
Date: Tue, 12 Jul 2022 15:38:17 +0800
Subject: [PATCH] jsoncpp and json third libs normalization

Signed-off-by: zero-cyc <chenlien@huawei.com>
Change-Id: I973bfa11b562bdce0978bef5b485680bb1347927
---
 bundle.json                              | 1 -
 frameworks/ans/BUILD.gn                  | 3 ---
 frameworks/core/BUILD.gn                 | 6 +-----
 frameworks/js/napi/BUILD.gn              | 2 --
 frameworks/js/napi/src/reminder/BUILD.gn | 2 --
 frameworks/test/moduletest/BUILD.gn      | 4 ----
 6 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/bundle.json b/bundle.json
index 64d67e5d7..96d71c78a 100644
--- a/bundle.json
+++ b/bundle.json
@@ -69,7 +69,6 @@
         "os_account_innerkits"
       ],
       "third_party": [
-        "jsoncpp",
         "libuv",
         "icu",
         "node",
diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn
index e17745f8b..70fd749d4 100644
--- a/frameworks/ans/BUILD.gn
+++ b/frameworks/ans/BUILD.gn
@@ -26,7 +26,6 @@ config("ans_innerkits_public_config") {
     "${core_path}/common/include",
     "${core_path}/include",
     "//third_party/json/single_include",
-    "//third_party/jsoncpp/include",
     "//utils/system/safwk/native/include",
   ]
   configs = [
@@ -39,7 +38,6 @@ ohos_shared_library("ans_innerkits") {
   include_dirs = [
     "${inner_api_path}",
     "//utils/system/safwk/native/include",
-    "//third_party/jsoncpp/include",
   ]
 
   sources = [
@@ -82,7 +80,6 @@ ohos_shared_library("ans_innerkits") {
 
   deps = [
     "${core_path}:ans_core",
-    "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utils",
   ]
 
diff --git a/frameworks/core/BUILD.gn b/frameworks/core/BUILD.gn
index 26f6baaab..ea5bb5a5d 100644
--- a/frameworks/core/BUILD.gn
+++ b/frameworks/core/BUILD.gn
@@ -25,7 +25,6 @@ config("public_ans_core_config") {
 
     "//utils/native/base/include",
     "//third_party/json/single_include",
-    "//third_party/jsoncpp/include",
   ]
 }
 
@@ -80,10 +79,7 @@ ohos_shared_library("ans_core") {
 
   public_configs = [ ":public_ans_core_config" ]
 
-  deps = [
-    "//third_party/jsoncpp:jsoncpp",
-    "//utils/native/base:utils",
-  ]
+  deps = [ "//utils/native/base:utils" ]
 
   external_deps = [
     "ability_base:base",
diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn
index a1d128eac..7801f533c 100644
--- a/frameworks/js/napi/BUILD.gn
+++ b/frameworks/js/napi/BUILD.gn
@@ -50,7 +50,6 @@ ohos_shared_library("notification") {
     "//third_party/node/src",
     "//third_party/libuv/include",
     "//third_party/json/single_include",
-    "//third_party/jsoncpp/include",
   ]
 
   configs = [ ":native_module_config" ]
@@ -79,7 +78,6 @@ ohos_shared_library("notification") {
     "${core_path}:ans_core",
     "${frameworks_module_ans_path}:ans_innerkits",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image",
-    "//third_party/jsoncpp:jsoncpp",
     "//third_party/libuv:uv_static",
     "//utils/native/base:utils",
   ]
diff --git a/frameworks/js/napi/src/reminder/BUILD.gn b/frameworks/js/napi/src/reminder/BUILD.gn
index 33077309d..50e22a027 100644
--- a/frameworks/js/napi/src/reminder/BUILD.gn
+++ b/frameworks/js/napi/src/reminder/BUILD.gn
@@ -41,7 +41,6 @@ ohos_shared_library("reminderagent") {
     "../../include",
     "//third_party/node/src",
     "//third_party/libuv/include",
-    "//third_party/jsoncpp/include",
   ]
 
   configs = [ ":native_module_config" ]
@@ -59,7 +58,6 @@ ohos_shared_library("reminderagent") {
     "${core_path}:ans_core",
     "${frameworks_module_ans_path}:ans_innerkits",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image",
-    "//third_party/jsoncpp:jsoncpp",
     "//third_party/libuv:uv_static",
     "//utils/native/base:utils",
   ]
diff --git a/frameworks/test/moduletest/BUILD.gn b/frameworks/test/moduletest/BUILD.gn
index 0a35f9d05..e5c39c97b 100644
--- a/frameworks/test/moduletest/BUILD.gn
+++ b/frameworks/test/moduletest/BUILD.gn
@@ -43,7 +43,6 @@ ohos_moduletest("ans_fw_module_test") {
     "${core_path}/include",
     "${inner_api_path}",
     "//utils/native/base/include",
-    "//third_party/jsoncpp/include",
     "${frameworks_path}/test/moduletest/mock/include",
   ]
 
@@ -117,7 +116,6 @@ ohos_moduletest("ans_innerkits_module_publish_test") {
     "${core_path}/include",
     "${inner_api_path}",
     "//utils/native/base/include",
-    "//third_party/jsoncpp/include",
     "${frameworks_path}/test/moduletest/mock/include",
   ]
 
@@ -193,7 +191,6 @@ ohos_moduletest("ans_innerkits_module_slot_test") {
     "${core_path}/include",
     "${inner_api_path}",
     "//utils/native/base/include",
-    "//third_party/jsoncpp/include",
     "${frameworks_path}/test/moduletest/mock/include",
   ]
 
@@ -267,7 +264,6 @@ ohos_moduletest("ans_innerkits_module_setting_test") {
     "${core_path}/include",
     "${inner_api_path}",
     "//utils/native/base/include",
-    "//third_party/jsoncpp/include",
     "${frameworks_path}/test/moduletest/mock/include",
   ]
 
-- 
Gitee