From 4f057dba768aa68a15b9cf66feb9fce13f529595 Mon Sep 17 00:00:00 2001 From: yangliu Date: Tue, 23 Apr 2024 14:21:12 +0800 Subject: [PATCH] update Signed-off-by: yangliu --- bundle.json | 3 ++- datamgr_service.gni | 2 -- services/distributeddataservice/app/BUILD.gn | 2 +- services/distributeddataservice/app/test/BUILD.gn | 5 ++++- .../app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bundle.json b/bundle.json index e85be5d59..d1752940a 100644 --- a/bundle.json +++ b/bundle.json @@ -79,7 +79,8 @@ "samgr", "time_service", "udmf", - "app_file_service" + "app_file_service", + "file_api" ], "third_party": [ "cJSON", diff --git a/datamgr_service.gni b/datamgr_service.gni index a83ddc6b3..64b9838f0 100644 --- a/datamgr_service.gni +++ b/datamgr_service.gni @@ -11,8 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -distributedfilejs_path = "//foundation/filemanagement/file_api" - kv_store_path = "//foundation/distributeddatamgr/kv_store" relational_store_path = "//foundation/distributeddatamgr/relational_store" diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 9435af066..30825196b 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -52,7 +52,6 @@ config("module_private_config") { "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/service/backup/include", "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/service/kvdb", "${device_manager_path}/interfaces/inner_kits/native_cpp/include", - "${distributedfilejs_path}/interfaces/kits/js/src/mod_securitylabel", "../adapter/include/account", "../adapter/include/permission", "../adapter/include/installer", @@ -136,6 +135,7 @@ ohos_shared_library("distributeddataservice") { "kv_store:distributeddb", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "file_api:securitylabel" ] if (datamgr_service_power) { diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index 9759bb3db..affbf9858 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -40,7 +40,6 @@ config("module_private_config") { "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/service/matrix/include", "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/app/src/session_manager", "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/service/kvdb", - "${distributedfilejs_path}/interfaces/kits/js/src/mod_securitylabel", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", @@ -97,6 +96,7 @@ ohos_unittest("KvStoreDataServiceTest") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "file_api:securitylabel" ] if (datamgr_service_power) { @@ -148,6 +148,7 @@ ohos_unittest("SessionManagerTest") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "file_api:securitylabel" ] if (datamgr_service_power) { @@ -188,6 +189,7 @@ ohos_unittest("KvStoreFlowCtrlManagerTest") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "file_api:securitylabel" ] if (datamgr_service_power) { @@ -248,6 +250,7 @@ ohos_unittest("KvStoreDataServiceClearTest") { "kv_store:distributeddb", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "file_api:securitylabel" ] if (datamgr_service_power) { diff --git a/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn index 5e6a9098a..10edbe074 100644 --- a/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("DataServiceStubFuzzTest") { "${data_service_path}/adapter/include/dfx", "${data_service_path}/adapter/include", "${device_manager_path}/interfaces/inner_kits/native_cpp/include", - "${distributedfilejs_path}/interfaces/kits/js/src/mod_securitylabel", "//third_party/json/single_include", ] @@ -108,6 +107,7 @@ ohos_fuzztest("DataServiceStubFuzzTest") { "kv_store:distributeddata_mgr", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "file_api:securitylabel" ] }