From 581dc27b173210cdf24869df81f0ea6ededac251 Mon Sep 17 00:00:00 2001 From: yangliu Date: Sat, 7 Jun 2025 11:26:37 +0800 Subject: [PATCH 1/6] update Signed-off-by: yangliu --- bundle.json | 3 ++- .../adapter/account/test/BUILD.gn | 3 ++- .../adapter/communicator/test/BUILD.gn | 2 +- .../test/fuzztest/softbusadapter_fuzzer/BUILD.gn | 1 + .../adapter/network/BUILD.gn | 2 ++ .../adapter/screenlock/BUILD.gn | 1 + services/distributeddataservice/app/test/BUILD.gn | 2 +- .../distributeddataservice/framework/test/BUILD.gn | 9 +++++++-- .../distributeddataservice/rust/extension/BUILD.gn | 1 + .../distributeddataservice/service/backup/BUILD.gn | 1 + .../service/bootstrap/BUILD.gn | 1 + .../distributeddataservice/service/cloud/BUILD.gn | 2 ++ .../distributeddataservice/service/common/BUILD.gn | 1 + .../distributeddataservice/service/matrix/BUILD.gn | 1 + .../distributeddataservice/service/object/BUILD.gn | 1 + .../distributeddataservice/service/test/BUILD.gn | 14 ++++++++++---- 16 files changed, 35 insertions(+), 10 deletions(-) diff --git a/bundle.json b/bundle.json index eb78c8cf7..c3159d078 100644 --- a/bundle.json +++ b/bundle.json @@ -95,7 +95,8 @@ "cJSON", "dmsfwk", "data_object", - "init" + "init", + "eventhandler" ], "third_party": [ "libuv", diff --git a/services/distributeddataservice/adapter/account/test/BUILD.gn b/services/distributeddataservice/adapter/account/test/BUILD.gn index 39c09ee55..bc5f8f3a6 100755 --- a/services/distributeddataservice/adapter/account/test/BUILD.gn +++ b/services/distributeddataservice/adapter/account/test/BUILD.gn @@ -40,10 +40,11 @@ ohos_unittest("AccountDelegateTest") { "ability_base:base", "ability_base:want", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "c_utils:utils", + "cJSON:cjson", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", diff --git a/services/distributeddataservice/adapter/communicator/test/BUILD.gn b/services/distributeddataservice/adapter/communicator/test/BUILD.gn index 04663104d..744b1f376 100755 --- a/services/distributeddataservice/adapter/communicator/test/BUILD.gn +++ b/services/distributeddataservice/adapter/communicator/test/BUILD.gn @@ -106,7 +106,7 @@ ohos_unittest("DeviceManagerAdapterTest") { ] external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "c_utils:utils", "device_manager:devicemanagersdk", diff --git a/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn b/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn index cc55d56d7..927b0f6ac 100644 --- a/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn +++ b/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("SoftBusAdapterFuzzTest") { "device_manager:devicemanagersdk", "dsoftbus:softbus_client", "hilog:libhilog", + "ipc:ipc_core", "kv_store:distributeddata_inner", "kv_store:distributeddb", ] diff --git a/services/distributeddataservice/adapter/network/BUILD.gn b/services/distributeddataservice/adapter/network/BUILD.gn index 880033e06..7aa7421f9 100644 --- a/services/distributeddataservice/adapter/network/BUILD.gn +++ b/services/distributeddataservice/adapter/network/BUILD.gn @@ -51,8 +51,10 @@ ohos_source_set("distributeddata_network") { sources += [ "src/network_delegate_normal_impl.cpp" ] deps += [ "${data_service_path}/adapter/communicator:distributeddata_communicator" ] external_deps += [ + "c_utils:utils", "device_manager:devicemanagersdk", "hilog:libhilog", + "ipc:ipc_core", "netmanager_base:net_conn_manager_if", ] } else { diff --git a/services/distributeddataservice/adapter/screenlock/BUILD.gn b/services/distributeddataservice/adapter/screenlock/BUILD.gn index f7813d16a..becd807ee 100644 --- a/services/distributeddataservice/adapter/screenlock/BUILD.gn +++ b/services/distributeddataservice/adapter/screenlock/BUILD.gn @@ -43,6 +43,7 @@ ohos_source_set("distributeddata_screenlock") { external_deps = [ "c_utils:utils", "common_event_service:cesfwk_innerkits", + "eventhandler:libeventhandler", "hilog:libhilog", "kv_store:datamgr_common", "screenlock_mgr:screenlock_client", diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index bccc0a525..a8ab0c6f9 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -161,7 +161,7 @@ ohos_unittest("SessionManagerTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "c_utils:utils", "dataclassification:data_transit_mgr", diff --git a/services/distributeddataservice/framework/test/BUILD.gn b/services/distributeddataservice/framework/test/BUILD.gn index bc8eb7d97..814d3f8d0 100644 --- a/services/distributeddataservice/framework/test/BUILD.gn +++ b/services/distributeddataservice/framework/test/BUILD.gn @@ -48,8 +48,9 @@ ohos_unittest("CheckerManagerTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "c_utils:utils", + "cJSON:cjson", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", @@ -213,6 +214,7 @@ ohos_unittest("CloudInfoTest") { external_deps = [ "cJSON:cjson", + "c_utils:utils", "kv_store:datamgr_common", ] } @@ -233,7 +235,10 @@ ohos_unittest("GeneralStoreTest") { sources = [ "general_store_test.cpp" ] configs = [ ":module_private_config" ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] - external_deps = [ "kv_store:datamgr_common" ] + external_deps = [ + "c_utils:utils", + "kv_store:datamgr_common", + ] } ohos_unittest("SubscriptionTest") { diff --git a/services/distributeddataservice/rust/extension/BUILD.gn b/services/distributeddataservice/rust/extension/BUILD.gn index 5a620259a..45246570d 100644 --- a/services/distributeddataservice/rust/extension/BUILD.gn +++ b/services/distributeddataservice/rust/extension/BUILD.gn @@ -61,6 +61,7 @@ ohos_shared_library("opencloudextension") { "access_token:libaccesstoken_sdk", "hilog:libhilog", "cJSON:cjson", + "c_utils:utils", "kv_store:datamgr_common", ] subsystem_name = "distributeddatamgr" diff --git a/services/distributeddataservice/service/backup/BUILD.gn b/services/distributeddataservice/service/backup/BUILD.gn index d0e21358c..a218e46fb 100755 --- a/services/distributeddataservice/service/backup/BUILD.gn +++ b/services/distributeddataservice/service/backup/BUILD.gn @@ -57,6 +57,7 @@ ohos_source_set("distributeddata_backup") { "device_manager:devicemanagersdk", "hilog:libhilog", "cJSON:cjson", + "c_utils:utils", "kv_store:datamgr_common", ] subsystem_name = "distributeddatamgr" diff --git a/services/distributeddataservice/service/bootstrap/BUILD.gn b/services/distributeddataservice/service/bootstrap/BUILD.gn index 0f6d8f04d..e384535fd 100644 --- a/services/distributeddataservice/service/bootstrap/BUILD.gn +++ b/services/distributeddataservice/service/bootstrap/BUILD.gn @@ -55,6 +55,7 @@ ohos_source_set("distributeddata_bootstrap") { external_deps = [ "hilog:libhilog", "cJSON:cjson", + "c_utils:utils", "kv_store:datamgr_common", ] subsystem_name = "distributeddatamgr" diff --git a/services/distributeddataservice/service/cloud/BUILD.gn b/services/distributeddataservice/service/cloud/BUILD.gn index 92a49cb1e..96d81ca31 100755 --- a/services/distributeddataservice/service/cloud/BUILD.gn +++ b/services/distributeddataservice/service/cloud/BUILD.gn @@ -70,6 +70,8 @@ ohos_source_set("distributeddata_cloud") { "access_token:libtokenid_sdk", "device_manager:devicemanagersdk", "hicollie:libhicollie", + "hilog:libhilog", + "ipc:ipc_core", "cJSON:cjson", "kv_store:datamgr_common", "kv_store:distributeddb", diff --git a/services/distributeddataservice/service/common/BUILD.gn b/services/distributeddataservice/service/common/BUILD.gn index 037060505..c34d40041 100644 --- a/services/distributeddataservice/service/common/BUILD.gn +++ b/services/distributeddataservice/service/common/BUILD.gn @@ -46,6 +46,7 @@ ohos_source_set("distributeddata_common") { external_deps = [ "hicollie:libhicollie", "hilog:libhilog", + "ipc:ipc_core", "kv_store:distributeddb", "relational_store:native_rdb", "kv_store:datamgr_common", diff --git a/services/distributeddataservice/service/matrix/BUILD.gn b/services/distributeddataservice/service/matrix/BUILD.gn index fc0110efb..65d3b4e66 100755 --- a/services/distributeddataservice/service/matrix/BUILD.gn +++ b/services/distributeddataservice/service/matrix/BUILD.gn @@ -59,6 +59,7 @@ ohos_source_set("distributeddata_matrix") { "device_manager:devicemanagersdk", "hilog:libhilog", "cJSON:cjson", + "c_utils:utils", "kv_store:datamgr_common", ] subsystem_name = "distributeddatamgr" diff --git a/services/distributeddataservice/service/object/BUILD.gn b/services/distributeddataservice/service/object/BUILD.gn index e76a7510e..35412b733 100644 --- a/services/distributeddataservice/service/object/BUILD.gn +++ b/services/distributeddataservice/service/object/BUILD.gn @@ -75,6 +75,7 @@ ohos_source_set("distributeddata_object") { "dfs_service:cloudsync_asset_kit_inner", "dfs_service:distributed_file_daemon_kit_inner", "dmsfwk:distributed_sdk", + "hilog:libhilog", "hisysevent:libhisysevent", "kv_store:datamgr_common", "kv_store:distributeddb", diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index e190c68bb..1a834056c 100644 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -80,6 +80,8 @@ ohos_unittest("CloudDataTest") { "c_utils:utils", "device_manager:devicemanagersdk", "hicollie:libhicollie", + "hilog:libhilog", + "ipc:ipc_core", "cJSON:cjson", "kv_store:distributeddata_inner", "kv_store:distributeddb", @@ -132,6 +134,8 @@ ohos_unittest("CloudServiceImplTest") { "c_utils:utils", "device_manager:devicemanagersdk", "hicollie:libhicollie", + "hilog:libhilog", + "ipc:ipc_core", "cJSON:cjson", "kv_store:distributeddata_inner", "kv_store:distributeddb", @@ -248,8 +252,9 @@ ohos_unittest("DirectoryManagerTest") { "ability_base:base", "ability_base:want", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "c_utils:utils", + "cJSON:cjson", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", @@ -829,7 +834,7 @@ ohos_unittest("MetaDataTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "c_utils:utils", "dataclassification:data_transit_mgr", @@ -878,7 +883,7 @@ ohos_unittest("UdmfRunTimeStoreTest") { "ability_base:base", "ability_base:want", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", @@ -1078,7 +1083,7 @@ ohos_unittest("KvdbServiceImplTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "c_utils:utils", "dataclassification:data_transit_mgr", @@ -1378,6 +1383,7 @@ ohos_unittest("UdmfPreProcessUtilsMockTest") { "hisysevent:libhisysevent", "hitrace:hitrace_meter", "hitrace:libhitracechain", + "hilog:libhilog", "kv_store:datamgr_common", "udmf:udmf_client", ] -- Gitee From 4f5a609ce481e9567cd11e24cf2099cf3f6de45e Mon Sep 17 00:00:00 2001 From: yangliu Date: Sat, 7 Jun 2025 19:08:10 +0800 Subject: [PATCH 2/6] update Signed-off-by: yangliu --- bundle.json | 3 +-- services/distributeddataservice/adapter/screenlock/BUILD.gn | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index c3159d078..eb78c8cf7 100644 --- a/bundle.json +++ b/bundle.json @@ -95,8 +95,7 @@ "cJSON", "dmsfwk", "data_object", - "init", - "eventhandler" + "init" ], "third_party": [ "libuv", diff --git a/services/distributeddataservice/adapter/screenlock/BUILD.gn b/services/distributeddataservice/adapter/screenlock/BUILD.gn index becd807ee..f7813d16a 100644 --- a/services/distributeddataservice/adapter/screenlock/BUILD.gn +++ b/services/distributeddataservice/adapter/screenlock/BUILD.gn @@ -43,7 +43,6 @@ ohos_source_set("distributeddata_screenlock") { external_deps = [ "c_utils:utils", "common_event_service:cesfwk_innerkits", - "eventhandler:libeventhandler", "hilog:libhilog", "kv_store:datamgr_common", "screenlock_mgr:screenlock_client", -- Gitee From 96503212890c21f92a9ed2df4b037e815221780b Mon Sep 17 00:00:00 2001 From: yangliu Date: Sat, 7 Jun 2025 20:30:47 +0800 Subject: [PATCH 3/6] update Signed-off-by: yangliu --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index eb78c8cf7..85ec716f5 100644 --- a/bundle.json +++ b/bundle.json @@ -95,7 +95,7 @@ "cJSON", "dmsfwk", "data_object", - "init" + "init", ], "third_party": [ "libuv", -- Gitee From 2b3722f5ddbf2b444dbb339ec0f725aff3e187e8 Mon Sep 17 00:00:00 2001 From: yangliu Date: Sat, 7 Jun 2025 20:31:45 +0800 Subject: [PATCH 4/6] update Signed-off-by: yangliu --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 85ec716f5..eb78c8cf7 100644 --- a/bundle.json +++ b/bundle.json @@ -95,7 +95,7 @@ "cJSON", "dmsfwk", "data_object", - "init", + "init" ], "third_party": [ "libuv", -- Gitee From af1fb7a18e6e87b35e8e4559f81a98b25b0c176e Mon Sep 17 00:00:00 2001 From: yangliu Date: Sun, 8 Jun 2025 16:14:27 +0800 Subject: [PATCH 5/6] update Signed-off-by: yangliu --- .../communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn | 2 +- services/distributeddataservice/adapter/network/BUILD.gn | 2 +- services/distributeddataservice/service/cloud/BUILD.gn | 2 +- services/distributeddataservice/service/common/BUILD.gn | 2 +- services/distributeddataservice/service/test/BUILD.gn | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn b/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn index 927b0f6ac..5e402778d 100644 --- a/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn +++ b/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn @@ -43,7 +43,7 @@ ohos_fuzztest("SoftBusAdapterFuzzTest") { "device_manager:devicemanagersdk", "dsoftbus:softbus_client", "hilog:libhilog", - "ipc:ipc_core", + "ipc:ipc_single", "kv_store:distributeddata_inner", "kv_store:distributeddb", ] diff --git a/services/distributeddataservice/adapter/network/BUILD.gn b/services/distributeddataservice/adapter/network/BUILD.gn index 7aa7421f9..6e2210db6 100644 --- a/services/distributeddataservice/adapter/network/BUILD.gn +++ b/services/distributeddataservice/adapter/network/BUILD.gn @@ -54,7 +54,7 @@ ohos_source_set("distributeddata_network") { "c_utils:utils", "device_manager:devicemanagersdk", "hilog:libhilog", - "ipc:ipc_core", + "ipc:ipc_single", "netmanager_base:net_conn_manager_if", ] } else { diff --git a/services/distributeddataservice/service/cloud/BUILD.gn b/services/distributeddataservice/service/cloud/BUILD.gn index 96d81ca31..1c25e0d60 100755 --- a/services/distributeddataservice/service/cloud/BUILD.gn +++ b/services/distributeddataservice/service/cloud/BUILD.gn @@ -71,7 +71,7 @@ ohos_source_set("distributeddata_cloud") { "device_manager:devicemanagersdk", "hicollie:libhicollie", "hilog:libhilog", - "ipc:ipc_core", + "ipc:ipc_single", "cJSON:cjson", "kv_store:datamgr_common", "kv_store:distributeddb", diff --git a/services/distributeddataservice/service/common/BUILD.gn b/services/distributeddataservice/service/common/BUILD.gn index c34d40041..50a08c56e 100644 --- a/services/distributeddataservice/service/common/BUILD.gn +++ b/services/distributeddataservice/service/common/BUILD.gn @@ -46,7 +46,7 @@ ohos_source_set("distributeddata_common") { external_deps = [ "hicollie:libhicollie", "hilog:libhilog", - "ipc:ipc_core", + "ipc:ipc_single", "kv_store:distributeddb", "relational_store:native_rdb", "kv_store:datamgr_common", diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index 1a834056c..a8c372ccb 100644 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -81,7 +81,7 @@ ohos_unittest("CloudDataTest") { "device_manager:devicemanagersdk", "hicollie:libhicollie", "hilog:libhilog", - "ipc:ipc_core", + "ipc:ipc_single", "cJSON:cjson", "kv_store:distributeddata_inner", "kv_store:distributeddb", @@ -135,7 +135,7 @@ ohos_unittest("CloudServiceImplTest") { "device_manager:devicemanagersdk", "hicollie:libhicollie", "hilog:libhilog", - "ipc:ipc_core", + "ipc:ipc_single", "cJSON:cjson", "kv_store:distributeddata_inner", "kv_store:distributeddb", -- Gitee From b8df39a8214bddc1e6ac5b458d6d8b4db4548989 Mon Sep 17 00:00:00 2001 From: yangliu Date: Sun, 8 Jun 2025 17:36:27 +0800 Subject: [PATCH 6/6] update Signed-off-by: yangliu --- services/distributeddataservice/adapter/account/test/BUILD.gn | 1 - services/distributeddataservice/framework/test/BUILD.gn | 1 - services/distributeddataservice/service/test/BUILD.gn | 1 - 3 files changed, 3 deletions(-) diff --git a/services/distributeddataservice/adapter/account/test/BUILD.gn b/services/distributeddataservice/adapter/account/test/BUILD.gn index bc5f8f3a6..e1549dccf 100755 --- a/services/distributeddataservice/adapter/account/test/BUILD.gn +++ b/services/distributeddataservice/adapter/account/test/BUILD.gn @@ -44,7 +44,6 @@ ohos_unittest("AccountDelegateTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "c_utils:utils", - "cJSON:cjson", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", diff --git a/services/distributeddataservice/framework/test/BUILD.gn b/services/distributeddataservice/framework/test/BUILD.gn index 814d3f8d0..002eaef72 100644 --- a/services/distributeddataservice/framework/test/BUILD.gn +++ b/services/distributeddataservice/framework/test/BUILD.gn @@ -50,7 +50,6 @@ ohos_unittest("CheckerManagerTest") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken_shared", "c_utils:utils", - "cJSON:cjson", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index a8c372ccb..7c3b386e0 100644 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -254,7 +254,6 @@ ohos_unittest("DirectoryManagerTest") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken_shared", "c_utils:utils", - "cJSON:cjson", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", -- Gitee