diff --git a/BUILD.gn b/BUILD.gn index de9ab8e86..71f3ee228 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -11,7 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/service/data_share/datamgr_service_data_share.gni") group("build_native_test") { testonly = true @@ -19,7 +18,6 @@ group("build_native_test") { "services/distributeddataservice/adapter/test:unittest", "services/distributeddataservice/app/test:unittest", "services/distributeddataservice/framework/test:unittest", - "${gaussrd_path}/test/unittest:unittest", "services/distributeddataservice/service/test:unittest", ] } diff --git a/services/distributeddataservice/service/data_share/BUILD.gn b/services/distributeddataservice/service/data_share/BUILD.gn index 1a95aeec1..ff536a184 100644 --- a/services/distributeddataservice/service/data_share/BUILD.gn +++ b/services/distributeddataservice/service/data_share/BUILD.gn @@ -89,7 +89,6 @@ ohos_shared_library("data_share_service") { ] external_deps = [ - "kv_store:distributeddb", "ability_base:want", "ability_base:zuri", "ability_runtime:dataobs_manager", @@ -104,6 +103,7 @@ ohos_shared_library("data_share_service") { "device_manager:devicemanagersdk", "hilog:libhilog", "ipc:ipc_core", + "kv_store:distributeddb", "relational_store:native_rdb", "relational_store:rdb_bms_adapter", "relational_store:rdb_data_share_adapter", diff --git a/services/distributeddataservice/service/data_share/datamgr_service_data_share.gni b/services/distributeddataservice/service/data_share/datamgr_service_data_share.gni deleted file mode 100644 index a2588bd0f..000000000 --- a/services/distributeddataservice/service/data_share/datamgr_service_data_share.gni +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -declare_args() { - gaussrd_path = "//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb/gaussdb_rd" -} diff --git a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn index e781b6039..ea7cd45f2 100644 --- a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn @@ -93,7 +93,6 @@ ohos_fuzztest("DataShareServiceStubFuzzTest") { "${data_service_path}/adapter:distributeddata_adapter", "${data_service_path}/framework:distributeddatasvcfwk", "${data_service_path}/service/data_share:data_share_service", - "${data_service_path}/service/data_share/gaussdb_rd:gaussdb_rd", ] external_deps = [ @@ -111,6 +110,7 @@ ohos_fuzztest("DataShareServiceStubFuzzTest") { "device_manager:devicemanagersdk", "hilog:libhilog", "ipc:ipc_core", + "kv_store:distributeddb", "relational_store:native_rdb", "relational_store:rdb_bms_adapter", "relational_store:rdb_data_share_adapter",