openharmony/distributeddatamgr_relational_store
1
0
Fork 0
mirror of https://gitee.com/openharmony/distributeddatamgr_relational_store synced 2025-02-17 00:39:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!510 change distributeddatamgr_appdatamgr utils native path to commonlibrary c_utils

Browse Source 
Merge pull request !510 from Heinriciro/orichange
This commit is contained in:
openharmony_ci 2022-07-28 06:23:25 +00:00 committed by Gitee
commit 56dec6684f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
13 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data_share/frameworks/js/napi/dataShare/BUILD.gn
View File

@ -43,6 +43,7 @@ ohos_shared_library("datashare") {
"ability_runtime:napi_base_context",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"data_share:datashare_abilitykit",
"data_share:datashare_common",
"eventhandler:libeventhandler",
@ -53,7 +54,6 @@ ohos_shared_library("datashare") {
"relational_store:native_appdatafwk",
"relational_store:native_dataability",
"relational_store:native_rdb",
"utils_base:utils",
]
relative_install_dir = "module/data"
@ -76,12 +76,12 @@ ohos_shared_library("datasharepredicates") {
deps = [ "${datashare_innerapi_path}/common:datashare_common" ]
external_deps = [
"c_utils:utils",
"data_share:datashare_abilitykit",
"data_share:datashare_common",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
"utils_base:utils",
]
relative_install_dir = "module/data"

4
data_share/interfaces/inner_api/BUILD.gn
View File

@ -83,11 +83,11 @@ ohos_shared_library("datashare_abilitykit") {
"access_token:libaccesstoken_sdk",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"ipc:ipc_core",
"ipc_js:rpc",
"relational_store:native_dataability",
"relational_store:native_rdb",
"utils_base:utils",
]
public_deps = [
@ -116,9 +116,9 @@ ohos_shared_library("datashare_ext_ability_module") {
external_deps = [
"ability_base:want",
"ability_runtime:runtime",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"relational_store:native_appdatafwk",
"utils_base:utils",
]
subsystem_name = "distributeddatamgr"

2
data_share/interfaces/inner_api/common/BUILD.gn
View File

@ -56,12 +56,12 @@ ohos_shared_library("datashare_common") {
deps = [
"//foundation/bundlemanager/bundle_framework/common:libappexecfwk_common",
"//utils/native/base:utils",
]
external_deps = [
"ability_base:zuri",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",

10
preferences/interfaces/inner_api/BUILD.gn
View File

@ -38,12 +38,12 @@ ohos_shared_library("native_preferences") {
configs = [ ":native_preferences_config" ]
deps = [
"//third_party/libxml2:libxml2",
"//utils/native/base:utils",
]
deps = [ "//third_party/libxml2:libxml2" ]
external_deps = [ "hilog_native:libhilog" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
]
public_configs = [ ":native_preferences_public_config" ]

3
relational_store/frameworks/js/napi/rdb/BUILD.gn
View File

@ -44,12 +44,11 @@ ohos_shared_library("rdb") {
"src/napi_values_bucket.cpp",
]
deps = [ "//utils/native/base:utils" ]
external_deps = [
"ability_base:want",
"ability_runtime:abilitykit_native",
"ability_runtime:napi_base_context",
"c_utils:utils",
"hilog_native:libhilog",
"napi:ace_napi",
"relational_store:native_appdatafwk",

7
relational_store/interfaces/inner_api/appdatafwk/BUILD.gn
View File

@ -32,13 +32,14 @@ ohos_shared_library("native_appdatafwk") {
subsystem_name = "distributeddatamgr"
part_name = "relational_store"
deps = [ "//utils/native/base:utils" ]
public_deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
]
external_deps = [ "hilog_native:libhilog" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
]
public_configs = [ ":appdatafwk_public_config" ]
}

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

@ -43,9 +43,8 @@ ohos_shared_library("native_dataability") {
configs = [ ":native_dataability_config" ]
deps = [ "//utils/native/base:utils" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"ipc:ipc_core",
"relational_store:native_rdb",

2
relational_store/interfaces/inner_api/rdb/BUILD.gn
View File

@ -86,7 +86,6 @@ ohos_shared_library("native_rdb") {
"//third_party/icu/icu4c:shared_icui18n",
"//third_party/icu/icu4c:shared_icuuc",
"//third_party/sqlite:sqlite",
"//utils/native/base:utils",
]
public_deps = [
@ -97,6 +96,7 @@ ohos_shared_library("native_rdb") {
]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"hitrace_native:hitrace_meter",
"hitrace_native:libhitrace",

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

@ -45,9 +45,8 @@ ohos_shared_library("rdb_data_share_adapter") {
subsystem_name = "distributeddatamgr"
part_name = "relational_store"
deps = [ "//utils/native/base:utils" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"relational_store:native_rdb",
]

8
relational_store/test/native/dataability/BUILD.gn
View File

@ -22,7 +22,7 @@ config("module_private_config") {
include_dirs = [
"${relational_store_native_path}/dataability/include",
"${relational_store_innerapi_path}/dataability/include",
"//utils/native/base/include",
"//commonlibrary/c_utils/base/include",
]
}
@ -34,15 +34,13 @@ ohos_unittest("NativeDataAbilityTest") {
configs = [ ":module_private_config" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"relational_store:native_dataability",
"relational_store:native_rdb",
]
deps = [
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
]
deps = [ "//third_party/googletest:gtest_main" ]
}
###############################################################################

4
relational_store/test/native/rdb/BUILD.gn
View File

@ -24,7 +24,7 @@ config("module_private_config") {
"${relational_store_innerapi_path}/rdb/include",
"${relational_store_native_path}/rdb/src",
"${relational_store_innerapi_path}/appdatafwk/include",
"//utils/native/base/include",
"//commonlibrary/c_utils/base/include",
]
if (relational_store_rdb_support_icu) {
@ -62,6 +62,7 @@ ohos_unittest("NativeRdbTest") {
configs = [ ":module_private_config" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"ipc:ipc_core",
"relational_store:native_rdb",
@ -72,7 +73,6 @@ ohos_unittest("NativeRdbTest") {
"//third_party/icu/icu4c:shared_icui18n",
"//third_party/icu/icu4c:shared_icuuc",
"//third_party/sqlite:sqlite",
"//utils/native/base:utils",
]
}

4
relational_store/test/native/rdb/fuzztest/rdbimpl_fuzzer/BUILD.gn
View File

@ -25,7 +25,7 @@ ohos_fuzztest("RdbImplFuzzTest") {
"${relational_store_innerapi_path}/rdb/include",
"//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/rdb",
"//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/rdb/include",
"//utils/native/base/include",
"//commonlibrary/c_utils/base/include",
"//third_party/sqlite/include",
"//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb/common/include/relational",
"//third_party/jsoncpp/include/json",
@ -55,10 +55,10 @@ ohos_fuzztest("RdbImplFuzzTest") {
deps = [
"//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:distributeddb",
"//third_party/jsoncpp:jsoncpp",
"//utils/native/base:utils",
]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"ipc:ipc_core",
"relational_store:native_rdb",

4
relational_store/test/native/rdb_data_share_adapter/BUILD.gn
View File

@ -30,7 +30,7 @@ config("module_private_config") {
"${datashare_base_path}/interfaces/inner_api/provider/include",
"${relational_store_innerapi_path}/rdb/include",
"${relational_store_innerapi_path}/rdb_data_share_adapter/include",
"//utils/native/base/include",
"//commonlibrary/c_utils/base/include",
]
if (relational_store_rdb_support_icu) {
@ -49,6 +49,7 @@ ohos_unittest("RdbDataShareAdapterTest") {
configs = [ ":module_private_config" ]
external_deps = [
"c_utils:utils",
"data_share:datashare_common",
"hilog_native:libhilog",
"relational_store:native_rdb",
@ -59,7 +60,6 @@ ohos_unittest("RdbDataShareAdapterTest") {
"//third_party/googletest:gtest_main",
"//third_party/icu/icu4c:shared_icui18n",
"//third_party/icu/icu4c:shared_icuuc",
"//utils/native/base:utils",
]
}