diff --git a/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn index a04a1d620a19c27b38bf96374ceebea23cd0ea63..94d220992a5f20d4bb72642aae398a2a6073e554 100644 --- a/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn @@ -20,9 +20,6 @@ ohos_fuzztest("DataServiceStubFuzzTest") { module_out_path = "datamgr_service/datamgr_service" include_dirs = [ - "${kv_store_common_path}", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", "${data_service_path}/service/bootstrap/include", "${data_service_path}/service/config/include", "${data_service_path}/service/crypto/include", @@ -46,8 +43,6 @@ ohos_fuzztest("DataServiceStubFuzzTest") { "${data_service_path}/adapter/include/installer", "${data_service_path}/adapter/include/utils", "${data_service_path}/adapter/include", - "${device_manager_path}/interfaces/inner_kits/native_cpp/include", - "//third_party/json/single_include", "${data_service_path}/adapter/include/communicator", ] @@ -89,7 +84,6 @@ ohos_fuzztest("DataServiceStubFuzzTest") { "${data_service_path}/app/src/installer:distributeddata_installer", "${data_service_path}/framework:distributeddatasvcfwk", "${data_service_path}/service:distributeddatasvc", - "${kv_store_distributeddb_path}:distributeddb", ] external_deps = [ @@ -100,6 +94,7 @@ ohos_fuzztest("DataServiceStubFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "dataclassification:data_transit_mgr", + "device_manager:devicemanagersdk", "file_api:securitylabel", "hicollie:libhicollie", "hilog:libhilog", @@ -109,6 +104,7 @@ ohos_fuzztest("DataServiceStubFuzzTest") { "ipc:ipc_core", "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", + "kv_store:distributeddb", "memmgr:memmgrclient", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/distributeddataservice/rust/extension/BUILD.gn b/services/distributeddataservice/rust/extension/BUILD.gn index d1c0fdc1d9dcba25c6c8102985f7961a48a950df..6cbd292433603811b2a941bc68eb444b2c1d7d26 100644 --- a/services/distributeddataservice/rust/extension/BUILD.gn +++ b/services/distributeddataservice/rust/extension/BUILD.gn @@ -23,7 +23,6 @@ config("module_public_config") { visibility = [ ":*" ] include_dirs = [ "../../framework/include", - "${kv_store_common_path}", ] } @@ -66,4 +65,4 @@ ohos_shared_library("opencloudextension") { ] subsystem_name = "distributeddatamgr" part_name = "datamgr_service" -} +} \ No newline at end of file diff --git a/services/distributeddataservice/service/crypto/BUILD.gn b/services/distributeddataservice/service/crypto/BUILD.gn index 2b8003be8137c4bd19b0cd10f74b2c36137b1033..0a0d5e65122af98d230645f97d92abe74d636752 100644 --- a/services/distributeddataservice/service/crypto/BUILD.gn +++ b/services/distributeddataservice/service/crypto/BUILD.gn @@ -53,4 +53,4 @@ ohos_source_set("distributeddata_crypto") { ] subsystem_name = "distributeddatamgr" part_name = "datamgr_service" -} +} \ No newline at end of file diff --git a/services/distributeddataservice/service/data_share/BUILD.gn b/services/distributeddataservice/service/data_share/BUILD.gn index 8bc36903c6e47bf6aadf24dfe0103e78c479b115..ef7b7be1ff09e85442d5374bba8b8ce10dfc8aba 100644 --- a/services/distributeddataservice/service/data_share/BUILD.gn +++ b/services/distributeddataservice/service/data_share/BUILD.gn @@ -142,4 +142,4 @@ ohos_source_set("data_share_service") { subsystem_name = "distributeddatamgr" part_name = "datamgr_service" -} +} \ No newline at end of file diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index 8b57b91c31f97136af18dca3ebece0da9bf56c11..229528c47292798ad624873d836102d58f8685ae 100644 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -91,10 +91,10 @@ ohos_unittest("CloudDataTest") { "${data_service_path}/adapter/communicator:distributeddata_communicator", "${data_service_path}/adapter/dfx:distributeddata_dfx", "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper", + "${data_service_path}/framework:distributeddatasvcfwk", "${data_service_path}/service/bootstrap:distributeddata_bootstrap", "${data_service_path}/service/common:distributeddata_common", "${data_service_path}/service/rdb:distributeddata_rdb", - "${data_service_path}/framework:distributeddatasvcfwk", "mock:distributeddata_mock_static", ] @@ -143,10 +143,10 @@ ohos_unittest("CloudServiceImplTest") { "${data_service_path}/adapter/communicator:distributeddata_communicator", "${data_service_path}/adapter/dfx:distributeddata_dfx", "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper", + "${data_service_path}/framework:distributeddatasvcfwk", "${data_service_path}/service/bootstrap:distributeddata_bootstrap", "${data_service_path}/service/common:distributeddata_common", "${data_service_path}/service/rdb:distributeddata_rdb", - "${data_service_path}/framework:distributeddatasvcfwk", "mock:distributeddata_mock_static", ] @@ -453,9 +453,7 @@ ohos_unittest("RdbResultSetImplTest") { "rdb_result_set_impl_test.cpp", ] - include_dirs = [ - "${data_service_path}/service/rdb", - ] + include_dirs = [ "${data_service_path}/service/rdb" ] configs = [ ":module_private_config" ] @@ -510,12 +508,6 @@ ohos_unittest("RdbServiceTest") { "rdb_result_set_stub_test.cpp", ] - include_dirs = [ - "${relational_store_path}/interfaces/inner_api/cloud_data/include", - "${relational_store_path}/interfaces/inner_api/rdb/include", - "${relational_store_path}/interfaces/inner_api/common_type/include", - ] - configs = [ ":module_private_config" ] cflags = [ @@ -535,14 +527,14 @@ ohos_unittest("RdbServiceTest") { "hilog:libhilog", "ipc:ipc_core", "kv_store:distributeddata_inner", - "kv_store:distributeddb" + "kv_store:distributeddb", + "relational_store:native_rdb", ] deps = [ "${data_service_path}/adapter/utils:distributeddata_utils", "${data_service_path}/framework:distributeddatasvcfwk", "${data_service_path}/service:distributeddatasvc", - "${relational_store_inner_api_path}:native_rdb_static", ] } @@ -857,11 +849,13 @@ ohos_unittest("MetaDataTest") { "c_utils:utils", "dataclassification:data_transit_mgr", "device_manager:devicemanagersdk", + "device_manager:devicemanagersdk", "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", "json:nlohmann_json_static", + "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "kv_store:distributeddb", "kv_store:kvdb_inner_lite", @@ -938,13 +932,7 @@ ohos_unittest("DataShareServiceImplTest") { } module_out_path = module_output_path - include_dirs = [ - "${data_service_path}/service/config/include", - "${datashare_path}/frameworks/native/common/include", - "${datashare_path}/interfaces/inner_api/common/include", - "${datashare_path}/interfaces/inner_api/consumer/include", - "//third_party/json/single_include", - ] + include_dirs = [ "${data_service_path}/service/config/include" ] sources = [ "${data_service_path}/service/common/xcollie.cpp", @@ -1033,6 +1021,7 @@ ohos_unittest("DataShareServiceImplTest") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "data_share:datashare_common", + "data_share:datashare_consumer", "device_manager:devicemanagersdk", "googletest:gtest_main", "hicollie:libhicollie", @@ -1110,9 +1099,9 @@ ohos_unittest("KvdbServiceImplTest") { "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", - "kv_store:distributeddb", - "kv_store:distributeddata_mgr", "kv_store:distributeddata_inner", + "kv_store:distributeddata_mgr", + "kv_store:distributeddb", "kv_store:kvdb_inner_lite", "relational_store:native_rdb", ] @@ -1609,8 +1598,8 @@ ohos_unittest("BootStrapMockTest") { deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", "${data_service_path}/framework:distributeddatasvcfwk", - "${data_service_path}/service/backup:distributeddata_backup", "${data_service_path}/framework:distributeddatasvcfwk", + "${data_service_path}/service/backup:distributeddata_backup", ] cflags = [ diff --git a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn index 55b263a748d9bfab4810b52d5338fed2cb4fb987..3f059f61afd2b6263217c11011ac9a4358ad91d2 100644 --- a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn @@ -30,6 +30,7 @@ ohos_fuzztest("CloudServiceStubFuzzTest") { "${data_service_path}/service/object", "${data_service_path}/service/permission/include", "${data_service_path}/service/rdb", + "${data_service_path}/adapter/include/communicator", ] fuzz_config_file = "${data_service_path}/service/test/fuzztest/cloudservicestub_fuzzer" @@ -54,11 +55,11 @@ ohos_fuzztest("CloudServiceStubFuzzTest") { "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper", "${data_service_path}/adapter/utils:distributeddata_utils", "${data_service_path}/framework:distributeddatasvcfwk", + "${data_service_path}/service:distributeddatasvc", "${data_service_path}/service/bootstrap:distributeddata_bootstrap", "${data_service_path}/service/cloud:distributeddata_cloud", "${data_service_path}/service/common:distributeddata_common", "${data_service_path}/service/rdb:distributeddata_rdb", - "${kv_store_distributeddb_path}:distributeddb", ] external_deps = [ @@ -77,6 +78,7 @@ ohos_fuzztest("CloudServiceStubFuzzTest") { "kv_store:datamgr_common", "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", + "kv_store:distributeddb", "relational_store:native_rdb", "resource_management:global_resmgr", "safwk:system_ability_fwk", diff --git a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn index dfb20f04e232c9d0a260fd140a2be847a4a0d2e0..d365536bdd22ba3d297fb48fb3d1f1ea95ef2948 100644 --- a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn @@ -34,10 +34,6 @@ ohos_fuzztest("DataShareServiceStubFuzzTest") { "${data_service_path}/service/data_share", "${data_service_path}/service/kvdb", "${data_service_path}/service/permission/include", - "${datashare_path}/frameworks/native/common/include", - "${datashare_path}/interfaces/inner_api/common/include", - "${datashare_path}/interfaces/inner_api/consumer/include", - "//third_party/json/single_include", "${data_service_path}/adapter/include/communicator", ] @@ -123,6 +119,7 @@ ohos_fuzztest("DataShareServiceStubFuzzTest") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "data_share:datashare_common", + "data_share:datashare_consumer", "device_manager:devicemanagersdk", "hicollie:libhicollie", "hilog:libhilog", diff --git a/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn index c0b40e1c23e9561434755e158324a4fb6872bf38..a9c5923adf166905d05da9184af41bb7b9a6f296 100644 --- a/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn @@ -19,10 +19,7 @@ import("//foundation/distributeddatamgr/datamgr_service/datamgr_service.gni") ohos_fuzztest("DumpHelperFuzzTest") { module_out_path = "datamgr_service/datamgr_service" - include_dirs = [ - "${data_service_path}/service/dumper/include", - "//third_party/json/single_include", - ] + include_dirs = [ "${data_service_path}/service/dumper/include" ] fuzz_config_file = "${data_service_path}/service/test/fuzztest/dumphelper_fuzzer" @@ -62,6 +59,7 @@ ohos_fuzztest("DumpHelperFuzzTest") { "ipc:ipc_core", "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", + "kv_store:distributeddb", "relational_store:native_rdb", "kv_store:distributeddb" ] diff --git a/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn index e3d93e45b12bc78a313eddf3fe9dc341d70375f3..eb91837f6d267fa1321da465d52f742a0677ccce 100755 --- a/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn @@ -30,19 +30,6 @@ ohos_fuzztest("ObjectServiceStubFuzzTest") { "${data_service_path}/service/crypto/include", "${data_service_path}/service/object/include", "${data_service_path}/service/matrix/include", - "${kv_store_common_path}", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", - "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include", - "${kv_store_distributeddb_path}", - "${kv_store_distributeddb_path}/include/", - "${kv_store_distributeddb_path}/interfaces/include/", - "${kv_store_distributeddb_path}/interfaces/include/relational", - "${dataobject_path}/frameworks/innerkitsimpl/include", - "${dataobject_path}/frameworks/innerkitsimpl/include/common", - "${dataobject_path}/interfaces/innerkits", - "//third_party/json/single_include", - "${relational_store_path}/interfaces/inner_api/common_type/include", "${data_service_path}/adapter/include/communicator", "${data_service_path}/adapter/include/utils", ] @@ -94,7 +81,6 @@ ohos_fuzztest("ObjectServiceStubFuzzTest") { "${data_service_path}/adapter/utils:distributeddata_utils", "${data_service_path}/framework:distributeddatasvcfwk", "${data_service_path}/service:distributeddatasvc", - "${kv_store_distributeddb_path}:distributeddb", ] external_deps = [ @@ -105,6 +91,7 @@ ohos_fuzztest("ObjectServiceStubFuzzTest") { "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "c_utils:utils", + "data_object:data_object_inner", "data_object:distributeddataobject_impl", "device_auth:deviceauth_sdk", "device_manager:devicemanagersdk", @@ -118,6 +105,7 @@ ohos_fuzztest("ObjectServiceStubFuzzTest") { "json:nlohmann_json_static", "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", + "kv_store:distributeddb", ] } diff --git a/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn index 984eddf37dd2aad45543a029a8ed40df530a584d..90e0d2f23426e8779d06577a872acbb8365c4773 100644 --- a/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn @@ -25,18 +25,6 @@ ohos_fuzztest("RdbResultSetStubFuzzTest") { "${data_service_path}/framework/include", "${data_service_path}/service/rdb", "${data_service_path}/service/common", - "${kv_store_common_path}", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", - "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include", - "${kv_store_distributeddb_path}", - "${kv_store_distributeddb_path}/include/", - "${kv_store_distributeddb_path}/interfaces/include/", - "${kv_store_distributeddb_path}/interfaces/include/relational", - "${relational_store_path}/interfaces/inner_api/cloud_data/include", - "${relational_store_path}/interfaces/inner_api/rdb/include", - "${relational_store_path}/interfaces/inner_api/common_type/include", - "//third_party/json/single_include", ] fuzz_config_file = @@ -60,8 +48,6 @@ ohos_fuzztest("RdbResultSetStubFuzzTest") { "${data_service_path}/adapter/account:distributeddata_account", "${data_service_path}/adapter/utils:distributeddata_utils", "${data_service_path}/framework:distributeddatasvcfwk", - "${kv_store_distributeddb_path}:distributeddb", - "${relational_store_inner_api_path}:native_rdb_static", ] external_deps = [ @@ -80,6 +66,7 @@ ohos_fuzztest("RdbResultSetStubFuzzTest") { "ipc:ipc_core", "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", + "kv_store:distributeddb", "relational_store:native_rdb", ] } diff --git a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn index d8f90d8320d4f05b161aad8fa1cee0e0af049493..23fe264db5717c5da8cd8248cfbc63e2eb131c03 100644 --- a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn @@ -35,19 +35,6 @@ ohos_fuzztest("RdbServiceStubFuzzTest") { "${data_service_path}/service/object", "${data_service_path}/service/permission/include", "${data_service_path}/service/rdb", - "${kv_store_common_path}", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", - "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include", - "${kv_store_distributeddb_path}", - "${kv_store_distributeddb_path}/include/", - "${kv_store_distributeddb_path}/interfaces/include/", - "${kv_store_distributeddb_path}/interfaces/include/relational", - "${dataobject_path}/frameworks/innerkitsimpl/include", - "${relational_store_path}/interfaces/inner_api/cloud_data/include", - "${relational_store_path}/interfaces/inner_api/rdb/include", - "${relational_store_path}/interfaces/inner_api/common_type/include", - "//third_party/json/single_include", "${data_service_path}/adapter/include/communicator", ] @@ -72,11 +59,11 @@ ohos_fuzztest("RdbServiceStubFuzzTest") { "${data_service_path}/adapter/dfx:distributeddata_dfx", "${data_service_path}/adapter/utils:distributeddata_utils", "${data_service_path}/framework:distributeddatasvcfwk", + "${data_service_path}/service:distributeddatasvc", "${data_service_path}/service/bootstrap:distributeddata_bootstrap", "${data_service_path}/service/cloud:distributeddata_cloud", "${data_service_path}/service/common:distributeddata_common", "${data_service_path}/service/rdb:distributeddata_rdb", - "${kv_store_distributeddb_path}:distributeddb", ] external_deps = [ @@ -97,6 +84,7 @@ ohos_fuzztest("RdbServiceStubFuzzTest") { "ipc:ipc_core", "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", + "kv_store:distributeddb", "relational_store:native_rdb", "resource_management:global_resmgr", "samgr:samgr_proxy", diff --git a/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn index 27778e7e3510bfea62c572d1da3c0866496de80b..bd9b426a68ccccb27357bccd0cc6e32991c88c83 100644 --- a/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn @@ -20,16 +20,12 @@ ohos_fuzztest("UdmfServiceFuzzTest") { module_out_path = "datamgr_service/datamgr_service" include_dirs = [ - "${udmf_path}/framework/common", - "${udmf_path}/interfaces/innerkits/common", - "${udmf_path}/interfaces/innerkits/data", "${data_service_path}/framework/include", "${data_service_path}/service/udmf/lifecycle", "${data_service_path}/service/udmf/permission", "${data_service_path}/service/udmf/preprocess", "${data_service_path}/service/udmf/store", "${data_service_path}/service/udmf", - "${kv_store_path}/frameworks/common", ] fuzz_config_file = @@ -77,4 +73,4 @@ group("fuzztest") { deps = [ ":UdmfServiceFuzzTest" ] } -############################################################################### +############################################################################### \ No newline at end of file