From a3f117337babac93f5ed66601f76f1ca7ffa9b27 Mon Sep 17 00:00:00 2001 From: PaDaBoo Date: Fri, 22 Jul 2022 15:02:04 +0800 Subject: [PATCH] build:Correct external dependes of appdatamgr Signed-off-by: PaDaBoo --- data_share/bundle.json | 23 ++++++++----------- .../frameworks/js/napi/dataShare/BUILD.gn | 2 -- data_share/interfaces/inner_api/BUILD.gn | 4 +++- preferences/bundle.json | 9 ++------ preferences/frameworks/js/napi/BUILD.gn | 9 ++------ preferences/interfaces/inner_api/BUILD.gn | 1 - preferences/preferences.gni | 6 ----- relational_store/bundle.json | 15 ++++-------- .../frameworks/js/napi/dataability/BUILD.gn | 2 -- .../frameworks/js/napi/rdb/BUILD.gn | 4 +--- .../interfaces/inner_api/appdatafwk/BUILD.gn | 5 +--- .../interfaces/inner_api/dataability/BUILD.gn | 1 - .../interfaces/inner_api/rdb/BUILD.gn | 1 - .../inner_api/rdb_data_share_adapter/BUILD.gn | 1 - 14 files changed, 23 insertions(+), 60 deletions(-) diff --git a/data_share/bundle.json b/data_share/bundle.json index b7760051..e6d1b67d 100644 --- a/data_share/bundle.json +++ b/data_share/bundle.json @@ -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": [] }, diff --git a/data_share/frameworks/js/napi/dataShare/BUILD.gn b/data_share/frameworks/js/napi/dataShare/BUILD.gn index 4e32bf8d..150c0a51 100644 --- a/data_share/frameworks/js/napi/dataShare/BUILD.gn +++ b/data_share/frameworks/js/napi/dataShare/BUILD.gn @@ -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 = [ diff --git a/data_share/interfaces/inner_api/BUILD.gn b/data_share/interfaces/inner_api/BUILD.gn index c53100b6..1b1db09e 100644 --- a/data_share/interfaces/inner_api/BUILD.gn +++ b/data_share/interfaces/inner_api/BUILD.gn @@ -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", ] diff --git a/preferences/bundle.json b/preferences/bundle.json index a2e8bf24..b8a5fc19 100644 --- a/preferences/bundle.json +++ b/preferences/bundle.json @@ -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", diff --git a/preferences/frameworks/js/napi/BUILD.gn b/preferences/frameworks/js/napi/BUILD.gn index 8b599bf7..f8028d55 100644 --- a/preferences/frameworks/js/napi/BUILD.gn +++ b/preferences/frameworks/js/napi/BUILD.gn @@ -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 = [ diff --git a/preferences/interfaces/inner_api/BUILD.gn b/preferences/interfaces/inner_api/BUILD.gn index e0353d74..85509ef2 100644 --- a/preferences/interfaces/inner_api/BUILD.gn +++ b/preferences/interfaces/inner_api/BUILD.gn @@ -17,7 +17,6 @@ config("native_preferences_config") { include_dirs = [ "include", "${preferences_native_path}/include", - "//utils/native/base/include", ] } diff --git a/preferences/preferences.gni b/preferences/preferences.gni index f52e6964..b2cc205f 100644 --- a/preferences/preferences.gni +++ b/preferences/preferences.gni @@ -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" diff --git a/relational_store/bundle.json b/relational_store/bundle.json index 70f82a8d..bc10af4a 100644 --- a/relational_store/bundle.json +++ b/relational_store/bundle.json @@ -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", diff --git a/relational_store/frameworks/js/napi/dataability/BUILD.gn b/relational_store/frameworks/js/napi/dataability/BUILD.gn index 066147fa..41265d1c 100644 --- a/relational_store/frameworks/js/napi/dataability/BUILD.gn +++ b/relational_store/frameworks/js/napi/dataability/BUILD.gn @@ -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 = [ diff --git a/relational_store/frameworks/js/napi/rdb/BUILD.gn b/relational_store/frameworks/js/napi/rdb/BUILD.gn index 7634be79..aceb9f58 100644 --- a/relational_store/frameworks/js/napi/rdb/BUILD.gn +++ b/relational_store/frameworks/js/napi/rdb/BUILD.gn @@ -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 = [ diff --git a/relational_store/interfaces/inner_api/appdatafwk/BUILD.gn b/relational_store/interfaces/inner_api/appdatafwk/BUILD.gn index 12673729..0481d778 100644 --- a/relational_store/interfaces/inner_api/appdatafwk/BUILD.gn +++ b/relational_store/interfaces/inner_api/appdatafwk/BUILD.gn @@ -16,10 +16,7 @@ import( config("appdatafwk_config") { visibility = [ ":*" ] - include_dirs = [ - "include", - "//utils/native/base/include", - ] + include_dirs = [ "include" ] } config("appdatafwk_public_config") { diff --git a/relational_store/interfaces/inner_api/dataability/BUILD.gn b/relational_store/interfaces/inner_api/dataability/BUILD.gn index de9d7e1b..fef178a5 100644 --- a/relational_store/interfaces/inner_api/dataability/BUILD.gn +++ b/relational_store/interfaces/inner_api/dataability/BUILD.gn @@ -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", ] } diff --git a/relational_store/interfaces/inner_api/rdb/BUILD.gn b/relational_store/interfaces/inner_api/rdb/BUILD.gn index 5afe0e52..bf8fab93 100644 --- a/relational_store/interfaces/inner_api/rdb/BUILD.gn +++ b/relational_store/interfaces/inner_api/rdb/BUILD.gn @@ -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", ] diff --git a/relational_store/interfaces/inner_api/rdb_data_share_adapter/BUILD.gn b/relational_store/interfaces/inner_api/rdb_data_share_adapter/BUILD.gn index b1b15f03..829cf8b3 100644 --- a/relational_store/interfaces/inner_api/rdb_data_share_adapter/BUILD.gn +++ b/relational_store/interfaces/inner_api/rdb_data_share_adapter/BUILD.gn @@ -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",