openharmony/distributeddatamgr_relational_store
1
0
Fork 0
mirror of https://gitee.com/openharmony/distributeddatamgr_relational_store synced 2024-11-23 07:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rectify unreasonable dependencies between components

Browse Source 
Signed-off-by: leiiyb <leiyanbo@huawei.com>
This commit is contained in:
leiiyb 2023-06-21 18:27:14 +08:00
parent c7014e2ece
commit f5433edfed
10 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bundle.json
View File

@ -49,20 +49,27 @@
"deps": {
"components": [
"ability_runtime",
"bundle_framework",
"common_event_service",
"c_utils",
"device_manager",
"hilog_native",
"hitrace_native",
"hiviewdfx_hilog_native",
"huks",
"ipc",
"napi"
"napi",
"resource_management",
"samgr"
],
"third_party": [
"sqlite",
"shared_icuuc",
"shared_icui18n",
"libxml2",
"gtest_main",
"icu",
"libsec_shared",
"gtest_main"
"libxml2",
"shared_icui18n",
"shared_icuuc",
"sqlite"
]
},
"build": {

8
frameworks/js/napi/dataability/BUILD.gn
View File

@ -36,13 +36,15 @@ ohos_shared_library("dataability") {
"src/napi_predicates_utils.cpp",
]
deps = [ "${relational_store_napi_path}/rdb:napi_rdb" ]
deps = [
"${relational_store_innerapi_path}/dataability:native_dataability",
"${relational_store_innerapi_path}/rdb:native_rdb",
"${relational_store_napi_path}/rdb:napi_rdb",
]
external_deps = [
"hilog_native:libhilog",
"napi:ace_napi",
"relational_store:native_dataability",
"relational_store:native_rdb",
]
subsystem_name = "distributeddatamgr"

21
frameworks/js/napi/rdb/BUILD.gn
View File

@ -76,6 +76,12 @@ ohos_shared_library("napi_rdb") {
"src/napi_rdb_store_observer.cpp",
]
deps = [
"${relational_store_innerapi_path}/appdatafwk:native_appdatafwk",
"${relational_store_innerapi_path}/rdb:native_rdb",
"${relational_store_innerapi_path}/rdb_data_share_adapter:rdb_data_share_adapter",
]
external_deps = [
"ability_runtime:abilitykit_native",
"ability_runtime:napi_base_context",
@ -84,9 +90,6 @@ ohos_shared_library("napi_rdb") {
"hilog_native:libhilog",
"hitrace_native:hitrace_meter",
"napi:ace_napi",
"relational_store:native_appdatafwk",
"relational_store:native_rdb",
"relational_store:rdb_data_share_adapter",
]
}
@ -134,7 +137,14 @@ ohos_shared_library("rdb") {
"${relational_store_napi_path}/rdb/include",
]
defines = [ "SQLITE_DISTRIBUTE_RELATIONAL" ]
deps = [ ":napi_rdb" ]
deps = [
":napi_rdb",
"${relational_store_innerapi_path}/appdatafwk:native_appdatafwk",
"${relational_store_innerapi_path}/rdb:native_rdb",
"${relational_store_innerapi_path}/rdb_data_share_adapter:rdb_data_share_adapter",
]
external_deps = [
"ability_runtime:abilitykit_native",
"ability_runtime:napi_base_context",
@ -142,9 +152,6 @@ ohos_shared_library("rdb") {
"hilog_native:libhilog",
"hitrace_native:hitrace_meter",
"napi:ace_napi",
"relational_store:native_appdatafwk",
"relational_store:native_rdb",
"relational_store:rdb_data_share_adapter",
]
}

9
frameworks/js/napi/relationalstore/BUILD.gn
View File

@ -51,6 +51,12 @@ if (is_ohos) {
"src/napi_rdb_store_observer.cpp",
]
deps = [
"${relational_store_innerapi_path}/appdatafwk:native_appdatafwk",
"${relational_store_innerapi_path}/rdb:native_rdb",
"${relational_store_innerapi_path}/rdb_data_share_adapter:rdb_data_share_adapter",
]
external_deps = [
"ability_runtime:abilitykit_native",
"ability_runtime:napi_base_context",
@ -59,9 +65,6 @@ if (is_ohos) {
"hilog_native:libhilog",
"hitrace_native:hitrace_meter",
"napi:ace_napi",
"relational_store:native_appdatafwk",
"relational_store:native_rdb",
"relational_store:rdb_data_share_adapter",
]
subsystem_name = "distributeddatamgr"

3
frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp
View File

@ -300,7 +300,8 @@ int ParseDistributedConfigArg(const napi_env &env, size_t argc, napi_value * arg
context->distributedConfig = { true };
if (argc > 2) {
auto status = JSUtils::Convert2Value(env, argv[2], context->distributedConfig);
CHECK_RETURN_SET(status == napi_ok, std::make_shared<ParamError>("distributedConfig", "a DistributedConfig type"));
CHECK_RETURN_SET(status == napi_ok,
std::make_shared<ParamError>("distributedConfig", "a DistributedConfig type"));
}
LOG_DEBUG("ParseDistributedConfigArg end");
return OK;

3
interfaces/inner_api/appdatafwk/BUILD.gn
View File

@ -105,11 +105,10 @@ ohos_shared_library("native_appdatafwk") {
innerapi_tags = [ "platformsdk_indirect" ]
part_name = "relational_store"
public_deps = [ "${ipc_path}/ipc_single:ipc_single" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"ipc:ipc_single",
]
public_configs = [ ":appdatafwk_public_config" ]

3
interfaces/inner_api/dataability/BUILD.gn
View File

@ -48,11 +48,12 @@ ohos_shared_library("native_dataability") {
configs = [ ":native_dataability_config" ]
deps = [ "${relational_store_innerapi_path}/rdb:native_rdb" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"ipc:ipc_single",
"relational_store:native_rdb",
]
public_configs = [ ":native_dataability_public_config" ]

3
interfaces/inner_api/rdb_data_ability_adapter/BUILD.gn
View File

@ -43,10 +43,11 @@ ohos_shared_library("rdb_data_ability_adapter") {
subsystem_name = "distributeddatamgr"
part_name = "relational_store"
deps = [ "${relational_store_innerapi_path}/rdb:native_rdb" ]
external_deps = [
"c_utils:utils",
"relational_store:native_dataability",
"relational_store:native_rdb",
]
public_configs = [ ":rdb_data_ability_adapter_public_config" ]

3
interfaces/inner_api/rdb_data_share_adapter/BUILD.gn
View File

@ -48,10 +48,11 @@ ohos_shared_library("rdb_data_share_adapter") {
subsystem_name = "distributeddatamgr"
part_name = "relational_store"
deps = [ "${relational_store_innerapi_path}/rdb:native_rdb" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"relational_store:native_rdb",
]
public_configs = [ ":rdb_data_share_adapter_public_config" ]

3
interfaces/ndk/BUILD.gn
View File

@ -52,10 +52,11 @@ ohos_shared_library("native_rdb_ndk") {
defines = [ "API_EXPORT=__attribute__((visibility (\"default\")))" ]
deps = [ "${relational_store_innerapi_path}/rdb:native_rdb" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"relational_store:native_rdb",
]
part_name = "relational_store"