From 14d702b2a5ce349f1bb040cea77e48a81d95736e Mon Sep 17 00:00:00 2001 From: "zhangyafei.echo" Date: Sat, 10 Dec 2022 17:25:46 +0800 Subject: [PATCH] IssueNo:#I65M0O Description:Change the dependency on cjson_static to cjson in standard system. Sig:SIG_ApplicationFramework Feature or BugFix: Feature Binary Source: No Signed-off-by: zhangyafei.echo Change-Id: I75e22df01084a78bb0b7fba837b15f5388d1ce70 --- deps_adapter/BUILD.gn | 2 +- services/BUILD.gn | 6 +++--- .../devauthservaddmembertogroup_fuzzer/BUILD.gn | 2 +- .../devauthservaddmultimemberstogroup_fuzzer/BUILD.gn | 2 +- .../devauthservauthdevice_fuzzer/BUILD.gn | 2 +- .../devauthservcheckaccesstogroup_fuzzer/BUILD.gn | 2 +- .../devauthservcreategroup_fuzzer/BUILD.gn | 2 +- .../devauthservdeletegroup_fuzzer/BUILD.gn | 2 +- .../devauthservdeletememberfromgroup_fuzzer/BUILD.gn | 2 +- .../devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn | 2 +- .../devauthservgetdeviceinfobyid_fuzzer/BUILD.gn | 2 +- .../devauthservgetgroupinfo_fuzzer/BUILD.gn | 2 +- .../devauthservgetgroupinfobyid_fuzzer/BUILD.gn | 2 +- .../devauthservgetjoinedgroups_fuzzer/BUILD.gn | 2 +- .../devauthservgetpkinfolist_fuzzer/BUILD.gn | 2 +- .../devauthservgetregisterinfo_fuzzer/BUILD.gn | 2 +- .../devauthservgetrelatedgroups_fuzzer/BUILD.gn | 2 +- .../devauthservgettrusteddevices_fuzzer/BUILD.gn | 2 +- .../devauthservisdeviceingroup_fuzzer/BUILD.gn | 2 +- .../devauthservprocessauthdata_fuzzer/BUILD.gn | 2 +- .../devauthservprocessbinddata_fuzzer/BUILD.gn | 2 +- .../devauthservregcallback_fuzzer/BUILD.gn | 2 +- .../devauthservregdatachangelistener_fuzzer/BUILD.gn | 2 +- .../devauthservunregcallback_fuzzer/BUILD.gn | 2 +- .../devauthservunregdatachangelistener_fuzzer/BUILD.gn | 2 +- test/unittest/deviceauth/BUILD.gn | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/deps_adapter/BUILD.gn b/deps_adapter/BUILD.gn index 2c8aeaa8..e6e81579 100644 --- a/deps_adapter/BUILD.gn +++ b/deps_adapter/BUILD.gn @@ -126,7 +126,7 @@ if (defined(ohos_lite)) { cflags = [ "-DHILOG_ENABLE" ] deps = [ "//base/security/huks/interfaces/innerkits/huks_standard/main:libhukssdk", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", "//third_party/mbedtls:mbedtls_shared", "//third_party/openssl:libcrypto_shared", ] diff --git a/services/BUILD.gn b/services/BUILD.gn index 71546005..655f169e 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -170,7 +170,7 @@ if (os_level == "mini" || os_level == "small") { deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ @@ -221,7 +221,7 @@ if (os_level == "mini" || os_level == "small") { ":auth_service.rc", ":deviceauth", "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ @@ -265,7 +265,7 @@ if (os_level == "mini" || os_level == "small") { deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ diff --git a/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn index 6cd77524..c143ee0c 100644 --- a/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServAddMemberToGroupFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn index faab3bc7..39a71b47 100644 --- a/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServAddMultiMembersToGroupFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn index 9ad5665e..80eeddbb 100644 --- a/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServAuthDeviceFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn index b1785aa1..29585fe6 100644 --- a/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServCheckAccessToGroupFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn index 8399446d..b09b1a7c 100644 --- a/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServCreateGroupFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn index 9a983df6..fa5b58a9 100644 --- a/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServDeleteGroupFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn index d3aea249..81f485bb 100644 --- a/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServDeleteMemberFromGroupFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn index 7843b37f..3bb28afc 100644 --- a/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServDeleteMultiMembersFromGroupFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn index 234b43aa..d79e88a2 100644 --- a/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServGetDeviceInfoByIdFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn index 7a06fe65..093353a6 100644 --- a/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServGetGroupInfoFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn index eb36fa7a..de96831b 100644 --- a/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServGetGroupInfoByIdFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn index 3bb567ea..9b92e47f 100644 --- a/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServGetJoinedGroupsFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn index c48e5640..d6442de5 100644 --- a/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServGetPkInfoListFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn index fa15dac0..104ba8da 100644 --- a/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServGetRegisterInfoFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn index c5880f15..2f0df387 100644 --- a/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServGetRelatedGroupsFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn index ab28216e..43e4ce6f 100644 --- a/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServGetTrustedDevicesFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn index ed93c685..7c97cf11 100644 --- a/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServIsDeviceInGroupFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn index 1248ab70..eeb98dee 100644 --- a/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServProcessAuthDataFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn index 5602e248..cb0d191c 100644 --- a/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServProcessBindDataFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn index 3af9dea0..d19e7079 100644 --- a/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServRegCallbackFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn index 2922fedf..e81814a6 100644 --- a/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServRegDataChangeListenerFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn index f0a41b29..6a8c10b2 100644 --- a/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServUnregCallbackFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn index 0d3f9a58..139f1d0b 100644 --- a/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("DevAuthServUnregDataChangeListenerFuzzTest") { } deps = [ "${deps_adapter_path}:${hal_module_name}", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", ] external_deps = [ "c_utils:utils", diff --git a/test/unittest/deviceauth/BUILD.gn b/test/unittest/deviceauth/BUILD.gn index 6f102b9b..c4c34dd9 100644 --- a/test/unittest/deviceauth/BUILD.gn +++ b/test/unittest/deviceauth/BUILD.gn @@ -95,7 +95,7 @@ ohos_unittest("deviceauth_llt") { deps = [ "//base/security/huks/interfaces/innerkits/huks_standard/main:libhukssdk", - "//third_party/cJSON:cjson_static", + "//third_party/cJSON:cjson", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/mbedtls:mbedtls_shared",