From 7bcc7eeb3d2b1251969a9bc416821f42eb00f3aa Mon Sep 17 00:00:00 2001 From: PaDaBoo Date: Mon, 13 Jun 2022 09:32:01 +0800 Subject: [PATCH] =?UTF-8?q?appdatamgr=E4=BB=93=E9=83=A8=E4=BB=B6=E5=8F=8A?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: PaDaBoo --- bundle.json | 1 - services/BUILD.gn | 2 +- services/test/BUILD.gn | 14 +++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/bundle.json b/bundle.json index 1b615582..4a2cca14 100644 --- a/bundle.json +++ b/bundle.json @@ -27,7 +27,6 @@ "hiviewdfx", "ipc", "relational_store", - "dataability", "safwk", "samgr_standard" ] diff --git a/services/BUILD.gn b/services/BUILD.gn index aa10b398..263eb6dd 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -82,10 +82,10 @@ ohos_shared_library("fms_server") { "common_event_service:cesfwk_innerkits", "data_share:datashare_abilitykit", "data_share:datashare_common", - "dataability:native_dataability", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "relational_store:native_appdatafwk", + "relational_store:native_dataability", "relational_store:native_rdb", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index bffc6786..9ce71c0c 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("file_manager_proxy_test") { "$FMS_BASE_DIR/src/server", "$FMS_BASE_DIR/src/fileoper", "//third_party/googletest/googlemock/include/gmock", - "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/rdb/include", + "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/rdb/include", "//foundation/multimedia/media_library/interfaces/inner_api/media_library_helper/include", ] @@ -60,15 +60,15 @@ ohos_unittest("oper_factory_test") { "$FMS_BASE_DIR/src/server", "$FMS_BASE_DIR/src/fileoper", "//foundation/multimedia/media_library/interfaces/inner_api/media_library_helper/include", - "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/rdb/include", + "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/rdb/include", ] configs = [ "//build/config/compiler:exceptions" ] deps = [ "$FMS_BASE_DIR:fms_server", - "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/appdatafwk:native_appdatafwk", - "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/rdb:native_rdb", + "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/appdatafwk:native_appdatafwk", + "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/rdb:native_rdb", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] @@ -94,14 +94,14 @@ ohos_unittest("file_manager_service_test") { "$FMS_BASE_DIR/src/server", "$FMS_BASE_DIR/src/fileoper", "//foundation/multimedia/media_library/interfaces/inner_api/media_library_helper/include", - "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/rdb/include", + "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/rdb/include", ] configs = [ "//build/config/compiler:exceptions" ] deps = [ "$FMS_BASE_DIR:fms_server", - "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/appdatafwk:native_appdatafwk", - "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/rdb:native_rdb", + "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/appdatafwk:native_appdatafwk", + "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/rdb:native_rdb", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] -- Gitee