diff --git a/bundle.json b/bundle.json index 1b615582eaf3d1c7e7368cf0f449f96b30fa9e79..4a2cca14639c3bbd240ef2c3b14f940c7cd55d3b 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 aa10b3988a8237194a79b72ab2e69da92052e3f5..263eb6dd3cabcebbd75de44c742252e8111fdd28 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 bffc6786a416a9644273de126bf2ca8239355e71..9ce71c0c001f24991ed78dbd538602e734a33fe3 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", ]