Issue: https://gitee.com/openharmony/ability_ability_runtime/issues/I9O1FY

Comment: ability_runtime仓库对于第三方json整改

Signed-off-by: root <root@ICS-MOKWQZSMQLX>

frameworks/js/napi/ability_constant/BUILD.gn

@@ -18,6 +18,7 @@ ohos_shared_library("abilityconstant_napi") {
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_services_path}/common/include",
+    "//third_party/json/include",
   ]
 
   sources = [ "ability_constant_module.cpp" ]
@@ -29,7 +30,6 @@ ohos_shared_library("abilityconstant_napi") {
     "c_utils:utils",
     "hilog:libhilog",
     "ipc:ipc_core",
-    "json:json_static",
     "napi:ace_napi",
   ]
   public_external_deps = [ "ability_base:want" ]
@@ -42,6 +42,7 @@ ohos_shared_library("abilityconstant") {
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_services_path}/common/include",
+    "//third_party/json/include",
   ]
 
   sources = [ "ability_constant_module.cpp" ]
@@ -53,7 +54,6 @@ ohos_shared_library("abilityconstant") {
     "c_utils:utils",
     "hilog:libhilog",
     "ipc:ipc_core",
-    "json:json_static",
     "napi:ace_napi",
   ]
   public_external_deps = [ "ability_base:want" ]

frameworks/native/ability/native/BUILD.gn

@@ -89,6 +89,7 @@ config("ability_public_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${ability_runtime_innerkits_path}/ability_manager/include/continuation",
     "${ability_runtime_services_path}/common/include",
+    "//third_party/json/include",
   ]
 
   if (ability_runtime_graphics) {
@@ -114,6 +115,7 @@ config("abilitykit_utils_public_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${bundlefwk_inner_api_path}/appexecfwk_base/include",
+    "//third_party/json/include",
   ]
 
   if (ability_runtime_graphics) {
@@ -156,7 +158,6 @@ ohos_shared_library("abilitykit_utils") {
 
   public_external_deps = [
     "bundle_framework:appexecfwk_core",
-    "json:json_static",
     "jsoncpp:jsoncpp",
     "window_manager:libwm",
   ]
@@ -276,7 +277,6 @@ ohos_shared_library("abilitykit_native") {
   public_external_deps = [
     "accessibility:accessibility_common",
     "bundle_framework:appexecfwk_core",
-    "json:json_static",
     "jsoncpp:jsoncpp",
     "libuv:uv",
   ]
@@ -337,6 +337,7 @@ config("extensionkit_public_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${bundlefwk_inner_api_path}/appexecfwk_base/include",
+    "//third_party/json/include",
   ]
 
   if (ability_runtime_graphics) {
@@ -391,7 +392,6 @@ ohos_shared_library("extensionkit_native") {
 
   public_external_deps = [
     "bundle_framework:appexecfwk_core",
-    "json:json_static",
     "jsoncpp:jsoncpp",
   ]
 
@@ -681,8 +681,6 @@ ohos_shared_library("form_extension_module") {
     "napi:ace_napi",
   ]
 
-  public_external_deps = [ "json:json_static" ]
-
   relative_install_dir = "extensionability"
   subsystem_name = "ability"
   part_name = "ability_runtime"
@@ -784,7 +782,6 @@ ohos_shared_library("continuation_ipc") {
   ]
   public_external_deps = [
     "accessibility:accessibility_common",
-    "json:json_static",
     "libuv:uv",
   ]
 
@@ -827,7 +824,7 @@ ohos_shared_library("data_ability_helper") {
     "relational_store:native_rdb",
     "relational_store:rdb_data_ability_adapter",
   ]
-  public_external_deps = [ "json:json_static" ]
+
   innerapi_tags = [ "platformsdk" ]
   subsystem_name = "ability"
   part_name = "ability_runtime"
@@ -855,7 +852,7 @@ ohos_shared_library("service_extension_module") {
     "hilog:libhilog",
     "napi:ace_napi",
   ]
-  public_external_deps = [ "json:json_static" ]
+
   if (ability_runtime_graphics) {
     external_deps += [
       "image_framework:image",

frameworks/native/appkit/BUILD.gn

@@ -186,7 +186,7 @@ ohos_shared_library("appkit_native") {
     "i18n:preferred_language",
     "init:libbegetutil",
     "ipc:ipc_core",
-    "json:json_static",
+    "json:nlohmann_json_static",
     "napi:ace_napi",
     "resource_management:global_resmgr",
     "safwk:system_ability_fwk",
@@ -284,7 +284,7 @@ ohos_shared_library("app_context") {
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
-    "json:json_static",
+    "json:nlohmann_json_static",
     "napi:ace_napi",
     "resource_management:global_resmgr",
     "samgr:samgr_proxy",
@@ -345,7 +345,7 @@ ohos_shared_library("app_context_utils") {
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
-    "json:json_static",
+    "json:nlohmann_json_static",
     "napi:ace_napi",
     "resource_management:global_resmgr",
     "resource_management:resmgr_napi_core",
@@ -412,7 +412,7 @@ ohos_shared_library("appkit_delegator") {
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",
-    "json:json_static",
+    "json:nlohmann_json_static",
     "napi:ace_napi",
   ]
   public_external_deps = [ "ability_base:configuration" ]
@@ -467,7 +467,7 @@ ohos_shared_library("appkit_manager_helper") {
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
-    "json:json_static",
+    "json:nlohmann_json_static",
     "samgr:samgr_proxy",
   ]
 

interfaces/inner_api/app_manager/BUILD.gn

@@ -37,6 +37,7 @@ config("appmgr_core_config") {
 
 ohos_shared_library("app_manager") {
   include_dirs = [
+    "//third_party/json/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/dfr",
     "${ability_runtime_services_path}/appdfr/include",
     "${ability_runtime_services_path}/appmgr/include",
@@ -130,7 +131,6 @@ ohos_shared_library("app_manager") {
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
-    "json:json_static",
     "samgr:samgr_proxy",
   ]
   public_external_deps = [

interfaces/inner_api/dataobs_manager/BUILD.gn

@@ -49,10 +49,7 @@ ohos_shared_library("dataobs_manager") {
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]
-  public_external_deps = [
-    "ability_base:zuri",
-    "json:json_static",
-  ]
+  public_external_deps = [ "ability_base:zuri" ]
   innerapi_tags = [
     "platformsdk",
     "sasdk",

interfaces/inner_api/runtime/BUILD.gn

@@ -40,6 +40,7 @@ config("runtime_public_config") {
   include_dirs = [
     "${ability_runtime_path}/interfaces/kits/native/ability/native/ability_business_error",
     "include",
+    "//third_party/json/include",
   ]
 }
 
@@ -116,7 +117,6 @@ ohos_shared_library("runtime") {
     "samgr:samgr_proxy",
     "zlib:shared_libz",
   ]
-  public_external_deps = [ "json:json_static" ]
 
   if (cj_frontend) {
     sources += [ "${ability_runtime_native_path}/runtime/cj_runtime.cpp" ]

services/abilitymgr/BUILD.gn

@@ -39,6 +39,7 @@ config("abilityms_config") {
     "${ability_runtime_services_path}/common/include",
     "//prebuilts/jdk/jdk8/linux-x86/include",
     "//prebuilts/jdk/jdk8/linux-x86/include/linux",
+    "//third_party/json/include",
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${relational_store_innerapi_path}/rdb/include",
     "${relational_store_innerapi_path}/dataability/include",
@@ -161,7 +162,6 @@ ohos_shared_library("abilityms") {
     "init:libbeget_proxy",
     "init:libbegetutil",
     "ipc:ipc_core",
-    "json:json_static",
     "kv_store:distributeddata_inner",
     "os_account:os_account_innerkits",
     "relational_store:native_appdatafwk",

services/appmgr/BUILD.gn

@@ -18,6 +18,7 @@ config("appmgr_config") {
   include_dirs = [
     "include",
     "include/utils",
+    "//third_party/json/include",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_services_path}/common/include",
     "${ability_runtime_path}/tools/aa/include",
@@ -114,7 +115,6 @@ ohos_shared_library("libappms") {
     "init:libbeget_proxy",
     "init:libbegetutil",
     "ipc:ipc_core",
-    "json:json_static",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddata_mgr",
     "memory_utils:libmeminfo",

services/dataobsmgr/BUILD.gn

@@ -23,6 +23,7 @@ config("dataobsms_config") {
   include_dirs = [
     "include/",
     "${ability_runtime_services_path}/common/include",
+    "//third_party/json/include",
   ]
   cflags = []
   if (target_cpu == "arm") {
@@ -47,7 +48,6 @@ ohos_shared_library("dataobsms") {
     "ffrt:libffrt",
     "hilog:libhilog",
     "ipc:ipc_core",
-    "json:json_static",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
@@ -70,7 +70,6 @@ ohos_static_library("dataobsms_static") {
     "ffrt:libffrt",
     "hilog:libhilog",
     "ipc:ipc_core",
-    "json:json_static",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]

services/uripermmgr/BUILD.gn

@@ -70,7 +70,6 @@ ohos_shared_library("libupms") {
     "init:libbeget_proxy",
     "init:libbegetutil",
     "ipc:ipc_core",
-    "json:json_static",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "storage_service:storage_manager_sa_proxy",