From b3d12c014c1a1bd8941bdb7766ae4e3a69ea39cc Mon Sep 17 00:00:00 2001 From: gecheng Date: Fri, 16 May 2025 11:53:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gecheng --- services/distributeddataservice/adapter/network/BUILD.gn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/distributeddataservice/adapter/network/BUILD.gn b/services/distributeddataservice/adapter/network/BUILD.gn index fb25666a3..647fb5d8d 100644 --- a/services/distributeddataservice/adapter/network/BUILD.gn +++ b/services/distributeddataservice/adapter/network/BUILD.gn @@ -50,7 +50,10 @@ ohos_source_set("distributeddata_network") { "-Oz", ] - external_deps = [ "kv_store:datamgr_common" ] + external_deps = [ + "kv_store:datamgr_common", + "samgr:samgr_proxy", + ] if (datamgr_service_cloud) { sources += [ "src/network_delegate_normal_impl.cpp" ] -- Gitee From 15e1b4645e4247c7256c18900ea0275404b0c97b Mon Sep 17 00:00:00 2001 From: gecheng Date: Fri, 16 May 2025 15:44:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gecheng --- services/distributeddataservice/adapter/network/BUILD.gn | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/adapter/network/BUILD.gn b/services/distributeddataservice/adapter/network/BUILD.gn index 647fb5d8d..d0edeffe3 100644 --- a/services/distributeddataservice/adapter/network/BUILD.gn +++ b/services/distributeddataservice/adapter/network/BUILD.gn @@ -50,10 +50,7 @@ ohos_source_set("distributeddata_network") { "-Oz", ] - external_deps = [ - "kv_store:datamgr_common", - "samgr:samgr_proxy", - ] + external_deps = [ "kv_store:datamgr_common" ] if (datamgr_service_cloud) { sources += [ "src/network_delegate_normal_impl.cpp" ] @@ -64,6 +61,7 @@ ohos_source_set("distributeddata_network") { "device_manager:devicemanagersdk", "hilog:libhilog", "netmanager_base:net_conn_manager_if", + "samgr:samgr_proxy", ] } else { sources += [ "src/network_delegate_default_impl.cpp" ] -- Gitee From d5dacf16f1c79453237091ef62bd4ca7d849c1d9 Mon Sep 17 00:00:00 2001 From: gecheng Date: Wed, 28 May 2025 16:55:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=B2=BB?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gecheng --- .../distributeddataservice/framework/BUILD.gn | 7 ++-- .../framework/test/BUILD.gn | 32 ++++++++++++++++++- .../framework/utils/constant.cpp | 1 - .../service/common/BUILD.gn | 1 + .../service/config/BUILD.gn | 1 + .../service/crypto/BUILD.gn | 1 + .../service/test/BUILD.gn | 1 + 7 files changed, 37 insertions(+), 7 deletions(-) diff --git a/services/distributeddataservice/framework/BUILD.gn b/services/distributeddataservice/framework/BUILD.gn index 83b8bc210..7ef3c07d6 100644 --- a/services/distributeddataservice/framework/BUILD.gn +++ b/services/distributeddataservice/framework/BUILD.gn @@ -23,10 +23,6 @@ config("module_config") { "include", "include/utils", "${data_service_path}/adapter/include", - "${kv_store_path}/interfaces/innerkits/distributeddata/include", - "${kv_store_common_path}", - "${kv_store_distributeddb_path}/interfaces/include/", - "${kv_store_distributeddb_path}/include/", ] } @@ -34,7 +30,6 @@ config("module_public_config") { visibility = [ ":*" ] include_dirs = [ "include", - "${kv_store_common_path}", ] } @@ -141,6 +136,8 @@ ohos_shared_library("distributeddatasvcfwk") { "hilog:libhilog", "cJSON:cjson", "openssl:libcrypto_shared", + "kv_store:datamgr_common", + "kv_store:distributeddb", ] subsystem_name = "distributeddatamgr" diff --git a/services/distributeddataservice/framework/test/BUILD.gn b/services/distributeddataservice/framework/test/BUILD.gn index bbac87d0e..28c5ded0f 100644 --- a/services/distributeddataservice/framework/test/BUILD.gn +++ b/services/distributeddataservice/framework/test/BUILD.gn @@ -122,6 +122,7 @@ ohos_unittest("ServiceUtilsTest") { "hilog:libhilog", "ipc:ipc_core", "cJSON:cjson", + "kv_store:datamgr_common", ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] @@ -176,6 +177,10 @@ ohos_unittest("AssetLoaderTest") { sources = [ "asset_loader_test.cpp" ] configs = [ ":module_private_config" ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] + + external_deps = [ + "kv_store:datamgr_common", + ] } ohos_unittest("BackupRuleManagerTest") { @@ -183,6 +188,10 @@ ohos_unittest("BackupRuleManagerTest") { sources = [ "backup_rule_manager_test.cpp" ] configs = [ ":module_private_config" ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] + + external_deps = [ + "kv_store:datamgr_common", + ] } ohos_unittest("BindEventTest") { @@ -190,6 +199,10 @@ ohos_unittest("BindEventTest") { sources = [ "bind_event_test.cpp" ] configs = [ ":module_private_config" ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] + + external_deps = [ + "kv_store:datamgr_common", + ] } ohos_unittest("CloudInfoTest") { @@ -209,6 +222,10 @@ ohos_unittest("EventTest") { sources = [ "event_test.cpp" ] configs = [ ":module_private_config" ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] + + external_deps = [ + "kv_store:datamgr_common", + ] } ohos_unittest("GeneralStoreTest") { @@ -251,6 +268,7 @@ ohos_unittest("MetaDataManagerTest") { "hilog:libhilog", "ipc:ipc_core", "cJSON:cjson", + "kv_store:datamgr_common", ] deps = [ @@ -264,7 +282,11 @@ ohos_unittest("StoreMetaDataLocalTest") { sources = [ "store_meta_data_local_test.cpp" ] configs = [ ":module_private_config" ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] - external_deps = [ "cJSON:cjson" ] + + external_deps = [ + "cJSON:cjson", + "kv_store:datamgr_common", + ] } ohos_unittest("ConstantTest") { @@ -272,6 +294,10 @@ ohos_unittest("ConstantTest") { sources = [ "constant_test.cpp" ] configs = [ ":module_private_config" ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] + + external_deps = [ + "kv_store:datamgr_common", + ] } ohos_unittest("CryptoTest") { @@ -279,6 +305,10 @@ ohos_unittest("CryptoTest") { sources = [ "crypto_test.cpp" ] configs = [ ":module_private_config" ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] + + external_deps = [ + "kv_store:datamgr_common", + ] } ohos_unittest("ServiceMetaDataTest") { diff --git a/services/distributeddataservice/framework/utils/constant.cpp b/services/distributeddataservice/framework/utils/constant.cpp index 6fedf3f61..f0b40f544 100644 --- a/services/distributeddataservice/framework/utils/constant.cpp +++ b/services/distributeddataservice/framework/utils/constant.cpp @@ -15,7 +15,6 @@ #define LOG_TAG "Constant" #include "utils/constant.h" #include -#include "log_print.h" #include "securec.h" namespace OHOS { diff --git a/services/distributeddataservice/service/common/BUILD.gn b/services/distributeddataservice/service/common/BUILD.gn index 3a8e1990d..037060505 100644 --- a/services/distributeddataservice/service/common/BUILD.gn +++ b/services/distributeddataservice/service/common/BUILD.gn @@ -48,6 +48,7 @@ ohos_source_set("distributeddata_common") { "hilog:libhilog", "kv_store:distributeddb", "relational_store:native_rdb", + "kv_store:datamgr_common", ] subsystem_name = "distributeddatamgr" part_name = "datamgr_service" diff --git a/services/distributeddataservice/service/config/BUILD.gn b/services/distributeddataservice/service/config/BUILD.gn index aaf607e58..ac8f98861 100644 --- a/services/distributeddataservice/service/config/BUILD.gn +++ b/services/distributeddataservice/service/config/BUILD.gn @@ -61,6 +61,7 @@ ohos_source_set("distributeddata_config") { external_deps = [ "hilog:libhilog", "cJSON:cjson", + "kv_store:datamgr_common", ] subsystem_name = "distributeddatamgr" part_name = "datamgr_service" diff --git a/services/distributeddataservice/service/crypto/BUILD.gn b/services/distributeddataservice/service/crypto/BUILD.gn index 0a0d5e651..bbd37ad4b 100644 --- a/services/distributeddataservice/service/crypto/BUILD.gn +++ b/services/distributeddataservice/service/crypto/BUILD.gn @@ -50,6 +50,7 @@ ohos_source_set("distributeddata_crypto") { "dmsfwk:distributed_sdk", "hilog:libhilog", "huks:libhukssdk", + "kv_store:datamgr_common", ] subsystem_name = "distributeddatamgr" part_name = "datamgr_service" diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index c20ecdbfe..c5fb03e7c 100644 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -475,6 +475,7 @@ ohos_unittest("RdbResultSetImplTest") { "ipc:ipc_core", "kv_store:distributeddb", "relational_store:native_rdb", + "kv_store:datamgr_common", ] deps = [ -- Gitee From e47a288020bb8b93365fc8f4334a77191c2fbcb4 Mon Sep 17 00:00:00 2001 From: gecheng Date: Wed, 28 May 2025 16:59:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=AB=AF=E4=BA=91=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E5=8C=96=E6=B2=BB=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gecheng --- services/distributeddataservice/adapter/network/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/services/distributeddataservice/adapter/network/BUILD.gn b/services/distributeddataservice/adapter/network/BUILD.gn index 5c879532e..880033e06 100644 --- a/services/distributeddataservice/adapter/network/BUILD.gn +++ b/services/distributeddataservice/adapter/network/BUILD.gn @@ -54,7 +54,6 @@ ohos_source_set("distributeddata_network") { "device_manager:devicemanagersdk", "hilog:libhilog", "netmanager_base:net_conn_manager_if", - "samgr:samgr_proxy", ] } else { sources += [ "src/network_delegate_default_impl.cpp" ] -- Gitee