From 4dec347f0457a6947d79823816a1bf974233c54a Mon Sep 17 00:00:00 2001 From: zqq Date: Wed, 19 Jan 2022 16:13:24 +0800 Subject: [PATCH 1/2] modify bundle.json Signed-off-by: zqq --- bundle.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index 143a62227..f3dcc7a65 100644 --- a/bundle.json +++ b/bundle.json @@ -1,9 +1,9 @@ { "name": "@ohos/distributeddatamgr_datamgr", - "version": "1.0.0", + "version": "3.1.0", "description": "Distributed data manager that provides the capability to store data in the databases of different devices", "homePage": "https://gitee.com/openharmony", - "license": "Apache V2", + "license": "Apache License 2.0", "repository": "https://gitee.com/openharmony/distributeddatamgr_datamgr", "domain": "os", "language": "", @@ -18,7 +18,7 @@ "datamgr" ], "envs": [], - "dirs": [], + "dirs": {}, "author": { "name": "", "email": "", -- Gitee From 18a7cdb96030122227144bddbc9e6814e6ed12dd Mon Sep 17 00:00:00 2001 From: zqq Date: Thu, 20 Jan 2022 14:21:59 +0800 Subject: [PATCH 2/2] modify build.gn Signed-off-by: zqq --- interfaces/innerkits/app_distributeddata/BUILD.gn | 4 ++-- interfaces/innerkits/distributeddata/BUILD.gn | 2 +- interfaces/jskits/distributeddata/BUILD.gn | 1 + services/distributeddataservice/adapter/BUILD.gn | 1 + services/distributeddataservice/app/BUILD.gn | 6 ++++-- services/distributeddataservice/libs/distributeddb/BUILD.gn | 1 + 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/interfaces/innerkits/app_distributeddata/BUILD.gn b/interfaces/innerkits/app_distributeddata/BUILD.gn index e40e82144..58ea0814e 100755 --- a/interfaces/innerkits/app_distributeddata/BUILD.gn +++ b/interfaces/innerkits/app_distributeddata/BUILD.gn @@ -52,7 +52,6 @@ config("distributeddatafwk_public_config") { } ohos_shared_library("app_distributeddata") { - part_name = "distributeddatamgr" sources = [ "../../../frameworks/innerkitsimpl/distributeddatafwk/src/app_blob.cpp", "../../../frameworks/innerkitsimpl/distributeddatafwk/src/app_change_notification.cpp", @@ -69,10 +68,10 @@ ohos_shared_library("app_distributeddata") { configs = [ ":distributeddatafwk_config" ] ldflags = [ "-Wl,--exclude-libs,libcrypto_static.a" ] deps = [ + "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter", "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/account:distributeddata_account_static", "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/permission:distributeddata_permission_static", "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/utils:distributeddata_utils_static", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter", "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:distributeddb", "//utils/native/base:utils", ] @@ -85,6 +84,7 @@ ohos_shared_library("app_distributeddata") { public_configs = [ ":distributeddatafwk_public_config" ] subsystem_name = "distributeddatamgr" + part_name = "distributeddatamgr" } config("distributeddatafwk_communication_config") { diff --git a/interfaces/innerkits/distributeddata/BUILD.gn b/interfaces/innerkits/distributeddata/BUILD.gn index 103a11c69..be2ebb8b6 100755 --- a/interfaces/innerkits/distributeddata/BUILD.gn +++ b/interfaces/innerkits/distributeddata/BUILD.gn @@ -43,7 +43,6 @@ config("distributeddatafwk_public_config") { } ohos_shared_library("distributeddata_inner") { - part_name = "distributeddatamgr" sources = [ "../../../frameworks/innerkitsimpl/distributeddatafwk/src/blob.cpp", "../../../frameworks/innerkitsimpl/distributeddatafwk/src/change_notification.cpp", @@ -97,4 +96,5 @@ ohos_shared_library("distributeddata_inner") { public_configs = [ ":distributeddatafwk_public_config" ] subsystem_name = "distributeddatamgr" + part_name = "distributeddatamgr" } diff --git a/interfaces/jskits/distributeddata/BUILD.gn b/interfaces/jskits/distributeddata/BUILD.gn index 36f5a5771..681c80a20 100644 --- a/interfaces/jskits/distributeddata/BUILD.gn +++ b/interfaces/jskits/distributeddata/BUILD.gn @@ -72,4 +72,5 @@ ohos_shared_library("distributeddata") { subsystem_name = "distributeddatamgr" relative_install_dir = "module/data" + part_name = "distributeddatamgr" } diff --git a/services/distributeddataservice/adapter/BUILD.gn b/services/distributeddataservice/adapter/BUILD.gn index 7c630e73f..c904e629f 100755 --- a/services/distributeddataservice/adapter/BUILD.gn +++ b/services/distributeddataservice/adapter/BUILD.gn @@ -55,4 +55,5 @@ ohos_shared_library("distributeddata_adapter") { public_configs = [ ":distributeddata_adapter_public_config" ] subsystem_name = "distributeddatamgr" + part_name = "distributeddatamgr" } diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 1b882dfc4..67facf49a 100755 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -110,8 +110,9 @@ ohos_shared_library("distributeddataservice") { ] external_deps = [ - "aafwk_standard:base", - "aafwk_standard:intent", + "ability_runtime:app_manager", + "ability_runtime:base", + "ability_runtime:intent", "appexecfwk_standard:appexecfwk_base", "appexecfwk_standard:appexecfwk_core", "battery_manager_native:batterysrv_client", @@ -126,4 +127,5 @@ ohos_shared_library("distributeddataservice") { ] subsystem_name = "distributeddatamgr" + part_name = "distributeddatamgr" } diff --git a/services/distributeddataservice/libs/distributeddb/BUILD.gn b/services/distributeddataservice/libs/distributeddb/BUILD.gn index 2ccb01575..fcfe52fd4 100755 --- a/services/distributeddataservice/libs/distributeddb/BUILD.gn +++ b/services/distributeddataservice/libs/distributeddb/BUILD.gn @@ -257,4 +257,5 @@ ohos_shared_library("distributeddb") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] subsystem_name = "distributeddatamgr" + part_name = "distributeddatamgr" } -- Gitee