build:Correct external dependes of appdatamgr

Signed-off-by: PaDaBoo <xuejianwu@huawei.com>
This commit is contained in:
PaDaBoo 2022-07-22 15:02:04 +08:00
parent 4cec2c33fe
commit a3f117337b
14 changed files with 23 additions and 60 deletions

View File

@ -50,23 +50,18 @@
"ram": "",
"deps": {
"components": [
"ability_base",
"ability_runtime",
"want",
"libhilog",
"ipc_core",
"ace_napi",
"samgr_proxy",
"relational_store",
"napi",
"utils_base",
"ipc",
"eventhandler",
"bundle_framework",
"hiviewdfx_hilog_native",
"access_token",
"ability_runtime",
"ipc_js",
"napi",
"hiviewdfx_hilog_native",
"libuv",
"access_token"
"ipc",
"bundle_framework",
"utils_base",
"ability_base",
"eventhandler"
],
"third_party": []
},

View File

@ -19,8 +19,6 @@ ohos_shared_library("datashare") {
"${datashare_napi_path}/dataShare/include",
"${datashare_common_napi_path}/include",
"${datashare_common_native_path}/include",
"//third_party/node/src",
"//third_party/libuv/include",
]
sources = [

View File

@ -13,6 +13,8 @@
import("//build/ohos.gni")
import("//foundation/distributeddatamgr/appdatamgr/data_share/datashare.gni")
import(
"//foundation/distributeddatamgr/appdatamgr/relational_store/relational_store.gni")
config("ability_config") {
visibility = [ ":*" ]
@ -24,7 +26,7 @@ config("ability_config") {
"${datashare_native_consumer_path}/include",
"${datashare_native_provider_path}/include",
"${ability_runtime_napi_path}/inner/napi_common",
"//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/rdb/include",
"${relational_store_innerapi_path}/rdb/include",
"//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/rdb/include",
]

View File

@ -48,17 +48,12 @@
"ram": "",
"deps": {
"components": [
"ability_base",
"ability_runtime",
"want",
"libhilog",
"ipc_core",
"ace_napi",
"samgr_proxy",
"napi",
"hilog_native",
"ipc",
"utils_base"
"utils_base",
"ability_base"
],
"third_party": [
"libxml2",

View File

@ -12,8 +12,9 @@
# limitations under the License.
import("//build/ohos.gni")
import("//build/ohos/ace/ace.gni")
import("//foundation/distributeddatamgr/appdatamgr/data_share/datashare.gni")
import("//foundation/distributeddatamgr/appdatamgr/preferences/preferences.gni")
import(
"//foundation/distributeddatamgr/appdatamgr/relational_store/relational_store.gni")
ohos_copy("appdatamgr_declaration") {
sources = [ "./api" ]
@ -26,8 +27,6 @@ ohos_shared_library("storage") {
include_dirs = [
"include",
"${relational_store_js_common_path}/include",
"//third_party/node/src",
"//utils/native/base/include",
]
sources = [
@ -52,8 +51,6 @@ ohos_shared_library("storage_napi") {
include_dirs = [
"include",
"${relational_store_js_common_path}/include",
"//third_party/node/src",
"//utils/native/base/include",
]
sources = [
@ -84,8 +81,6 @@ ohos_shared_library("preferences") {
include_dirs = [
"include",
"${relational_store_js_common_path}/include",
"//third_party/node/src",
"//utils/native/base/include",
]
sources = [

View File

@ -17,7 +17,6 @@ config("native_preferences_config") {
include_dirs = [
"include",
"${preferences_native_path}/include",
"//utils/native/base/include",
]
}

View File

@ -18,9 +18,3 @@ preferences_napi_path = "${preferences_base_path}/frameworks/js/napi"
preferences_native_path = "${preferences_base_path}/frameworks/native"
preferences_innerapi_path = "${preferences_base_path}/interfaces/inner_api"
relational_store_base_path =
"//foundation/distributeddatamgr/appdatamgr/relational_store"
relational_store_js_common_path =
"${relational_store_base_path}/frameworks/js/napi/common"

View File

@ -50,19 +50,14 @@
"components": [
"ability_base",
"ability_runtime",
"want",
"libhilog",
"ipc_core",
"ace_napi",
"samgr_proxy",
"hitrace_native",
"common",
"napi",
"hitrace_native",
"hilog_native",
"icu",
"samgr_standard",
"ipc",
"utils_base"
"utils_base",
"common",
"icu",
"samgr_standard"
],
"third_party": [
"sqlite",

View File

@ -27,8 +27,6 @@ ohos_shared_library("dataability") {
"include",
"${relational_store_js_common_path}/include",
"${relational_store_napi_path}/rdb/include",
"//third_party/node/src",
"//utils/native/base/include",
]
sources = [

View File

@ -27,10 +27,8 @@ ohos_shared_library("rdb") {
include_dirs = [
"include",
"${relational_store_js_common_path}/include",
"${datashare_base_path}/interfaces/inner_api/common/include/",
"//third_party/node/src",
"//utils/native/base/include",
"${relational_store_napi_path}/rdb/include",
"${datashare_base_path}/interfaces/inner_api/common/include/",
]
sources = [

View File

@ -16,10 +16,7 @@ import(
config("appdatafwk_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"//utils/native/base/include",
]
include_dirs = [ "include" ]
}
config("appdatafwk_public_config") {

View File

@ -23,7 +23,6 @@ config("native_dataability_config") {
"include",
"${relational_store_native_path}/dataability/include",
"${relational_store_native_path}/dataability/src",
"//utils/native/base/include",
]
}

View File

@ -21,7 +21,6 @@ config("native_rdb_config") {
include_dirs = [
"include",
"${relational_store_native_path}/rdb/include",
"//utils/system/safwk/native/include",
"//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/dfx",
]

View File

@ -19,7 +19,6 @@ config("rdb_data_share_adapter_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"//utils/native/base/include",
"${datashare_base_path}/interfaces/inner_api/common/include",
"${datashare_base_path}/interfaces/inner_api/consumer/include",
"${datashare_base_path}/interfaces/inner_api/provider/include",