From b9a736d5d3769fde703d4f081baa7e300596fe72 Mon Sep 17 00:00:00 2001 From: y30045862 Date: Fri, 30 Jun 2023 19:49:17 +0800 Subject: [PATCH] =?UTF-8?q?public=5Fdeps=E8=BD=ACexternal=5Fdeps=20Signed-?= =?UTF-8?q?off-by:=20yangjingbo10=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I84beab2d44db1769ab99ca830d15b460609c986b --- frameworks/native/backup_ext/BUILD.gn | 4 +++ .../native/backup_kit_inner/BUILD.gn | 8 ++--- interfaces/kits/js/BUILD.gn | 24 +++++++++++--- services/backup_sa/BUILD.gn | 3 ++ tests/moduletests/backup_kit_inner/BUILD.gn | 2 ++ tests/moduletests/backup_tool/BUILD.gn | 2 ++ .../unittests/backup_api/backup_impl/BUILD.gn | 4 +++ tests/unittests/backup_sa/module_ipc/BUILD.gn | 12 +++++++ tests/unittests/backup_tools/BUILD.gn | 7 ++++ tests/unittests/backup_utils/BUILD.gn | 32 +++++++++++++++++-- tests/utils/BUILD.gn | 8 +++-- tools/backup_tool/BUILD.gn | 8 ++++- utils/BUILD.gn | 11 +++---- 13 files changed, 103 insertions(+), 22 deletions(-) diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn index ca0b73161..a07c80285 100644 --- a/frameworks/native/backup_ext/BUILD.gn +++ b/frameworks/native/backup_ext/BUILD.gn @@ -39,6 +39,7 @@ ohos_shared_library("backup_extension_ability_native") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", + "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -50,6 +51,9 @@ ohos_shared_library("backup_extension_ability_native") { "ability_runtime:runtime", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", + "c_utils:utils", + "hilog:libhilog", + "ipc:ipc_core", ] use_exceptions = true diff --git a/interfaces/inner_api/native/backup_kit_inner/BUILD.gn b/interfaces/inner_api/native/backup_kit_inner/BUILD.gn index b1b64c573..f413778e7 100644 --- a/interfaces/inner_api/native/backup_kit_inner/BUILD.gn +++ b/interfaces/inner_api/native/backup_kit_inner/BUILD.gn @@ -49,16 +49,14 @@ ohos_shared_library("backup_kit_inner") { public_configs = [ ":public_config" ] external_deps = [ + "c_utils:utils", + "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] - public_deps = [ - "${path_backup}/utils:backup_utils", - "${path_base}:utils", - "${path_ipc}/interfaces/innerkits/ipc_core:ipc_core", - ] + deps = [ "${path_backup}/utils:backup_utils" ] use_exceptions = true innerapi_tags = [ "platformsdk" ] diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 5c68b54c5..e1fee33f6 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -28,7 +28,12 @@ ohos_shared_library("remotefileshare") { deps = [ "${third_party_path}/bounds_checking_function:libsec_shared" ] - external_deps = [ "file_api:filemgmt_libn" ] + external_deps = [ + "file_api:filemgmt_libhilog", + "file_api:filemgmt_libn", + "hilog:libhilog", + "napi:ace_napi", + ] relative_install_dir = "module" @@ -56,10 +61,12 @@ ohos_shared_library("fileshare") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "file_api:filemgmt_libhilog", "file_api:filemgmt_libn", "file_api:remote_uri_native", "hilog:libhilog", "ipc:ipc_core", + "napi:ace_napi", ] relative_install_dir = "module" @@ -84,9 +91,11 @@ ohos_shared_library("fileuri") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "file_api:filemgmt_libhilog", "file_api:filemgmt_libn", "hilog:libhilog", "ipc:ipc_core", + "napi:ace_napi", "samgr:samgr_proxy", ] @@ -113,9 +122,16 @@ ohos_shared_library("backup") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", - "${path_file_api}/utils/filemgmt_libn:filemgmt_libn", - "${path_napi}:ace_napi", + "${path_backup}/utils:backup_utils", + "${path_jsoncpp}:jsoncpp", ] - public_deps = [ "${path_file_api}/utils/filemgmt_libhilog:filemgmt_libhilog" ] + external_deps = [ + "c_utils:utils", + "file_api:filemgmt_libhilog", + "file_api:filemgmt_libn", + "hilog:libhilog", + "ipc:ipc_core", + "napi:ace_napi", + ] } diff --git a/services/backup_sa/BUILD.gn b/services/backup_sa/BUILD.gn index 1c5e1f693..16e1f6529 100644 --- a/services/backup_sa/BUILD.gn +++ b/services/backup_sa/BUILD.gn @@ -38,6 +38,7 @@ ohos_shared_library("backup_sa") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", + "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -46,6 +47,8 @@ ohos_shared_library("backup_sa") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", + "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/tests/moduletests/backup_kit_inner/BUILD.gn b/tests/moduletests/backup_kit_inner/BUILD.gn index 32646475f..3f36ffc08 100644 --- a/tests/moduletests/backup_kit_inner/BUILD.gn +++ b/tests/moduletests/backup_kit_inner/BUILD.gn @@ -40,6 +40,8 @@ ohos_unittest("b_session_test") { ] external_deps = [ + "c_utils:utils", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/tests/moduletests/backup_tool/BUILD.gn b/tests/moduletests/backup_tool/BUILD.gn index 1b2d4fdb3..6e39dd850 100644 --- a/tests/moduletests/backup_tool/BUILD.gn +++ b/tests/moduletests/backup_tool/BUILD.gn @@ -27,6 +27,8 @@ ohos_unittest("tools_op_test") { "${path_backup}/utils/:backup_utils", ] + external_deps = [ "hilog:libhilog" ] + use_exceptions = true } diff --git a/tests/unittests/backup_api/backup_impl/BUILD.gn b/tests/unittests/backup_api/backup_impl/BUILD.gn index 3baea6efe..dd920f373 100644 --- a/tests/unittests/backup_api/backup_impl/BUILD.gn +++ b/tests/unittests/backup_api/backup_impl/BUILD.gn @@ -32,6 +32,8 @@ ohos_unittest("b_file_info_test") { "${path_backup}/utils:backup_utils", ] + external_deps = [ "hilog:libhilog" ] + use_exceptions = true } @@ -63,6 +65,8 @@ ohos_unittest("backup_sa_impl_test") { ] external_deps = [ + "c_utils:utils", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index b341d3a01..4d7d4a39c 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -43,6 +43,8 @@ ohos_unittest("module_ipc_test") { "ability_base:want", "ability_runtime:ability_manager", "c_utils:utils", + "hilog:libhilog", + "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", @@ -77,12 +79,16 @@ ohos_unittest("backup_service_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", + "${path_jsoncpp}:jsoncpp", ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "c_utils:utils", + "hilog:libhilog", "init:libbegetutil", + "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", @@ -118,6 +124,7 @@ ohos_unittest("backup_service_session_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", + "${path_jsoncpp}:jsoncpp", ] external_deps = [ @@ -126,6 +133,8 @@ ohos_unittest("backup_service_session_test") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "hilog:libhilog", + "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", @@ -165,6 +174,9 @@ ohos_unittest("backup_service_scheduler_test") { "ability_runtime:ability_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", + "hilog:libhilog", + "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", "storage_service:storage_manager_sa_proxy", diff --git a/tests/unittests/backup_tools/BUILD.gn b/tests/unittests/backup_tools/BUILD.gn index d23baac8d..c7ee12c24 100644 --- a/tests/unittests/backup_tools/BUILD.gn +++ b/tests/unittests/backup_tools/BUILD.gn @@ -40,10 +40,13 @@ ohos_unittest("backup_tool_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", + "${path_googletest}:gmock_main", + "${path_jsoncpp}:jsoncpp", ] external_deps = [ "c_utils:utils", + "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", "samgr:samgr_proxy", @@ -74,14 +77,18 @@ ohos_unittest("backup_tool_restore_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", + "${path_googletest}:gmock_main", + "${path_jsoncpp}:jsoncpp", ] external_deps = [ "c_utils:utils", + "hilog:libhilog", "hitrace_native:hitrace_meter", "ipc:ipc_core", "samgr:samgr_proxy", ] + use_exceptions = true } diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn index 3e7a4d4bc..6148f4aa3 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -24,6 +24,8 @@ ohos_unittest("b_error_test") { "${path_backup}/utils/:backup_utils", ] + external_deps = [ "hilog:libhilog" ] + use_exceptions = true } @@ -38,6 +40,12 @@ ohos_unittest("b_file_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", + "${path_jsoncpp}:jsoncpp", + ] + + external_deps = [ + "c_utils:utils", + "hilog:libhilog", ] use_exceptions = true @@ -61,6 +69,12 @@ ohos_unittest("b_json_test") { "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", "${path_googletest}:gmock_main", + "${path_jsoncpp}:jsoncpp", + ] + + external_deps = [ + "c_utils:utils", + "hilog:libhilog", ] use_exceptions = true @@ -82,8 +96,13 @@ ohos_unittest("b_tarball_cmdline_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", + "${path_googletest}:gmock_main", + ] + + external_deps = [ + "c_utils:utils", + "hilog:libhilog", ] - external_deps = [ "c_utils:utils" ] use_exceptions = true } @@ -101,7 +120,10 @@ ohos_unittest("b_tarball_factory_test") { "${path_backup}/utils/include", ] - deps = [ "${path_backup}/tests/utils:backup_test_utils" ] + deps = [ + "${path_backup}/tests/utils:backup_test_utils", + "${path_googletest}:gmock_main", + ] external_deps = [ "c_utils:utils" ] use_exceptions = true } @@ -119,8 +141,12 @@ ohos_unittest("b_process_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", + "${path_jsoncpp}:jsoncpp", + ] + external_deps = [ + "c_utils:utils", + "hilog:libhilog", ] - external_deps = [ "c_utils:utils" ] use_exceptions = true } diff --git a/tests/utils/BUILD.gn b/tests/utils/BUILD.gn index 15e364007..2e4508f88 100644 --- a/tests/utils/BUILD.gn +++ b/tests/utils/BUILD.gn @@ -25,9 +25,11 @@ ohos_static_library("backup_test_utils") { public_configs = [ ":test_util_public_config" ] - deps = [ "${path_backup}/utils:backup_utils" ] - public_deps = [ "${path_googletest}:gmock_main" ] - + deps = [ + "${path_backup}/utils:backup_utils", + "${path_googletest}:gmock_main", + ] + external_deps = [ "hilog:libhilog" ] use_exceptions = true part_name = "app_file_service" subsystem_name = "filemanagement" diff --git a/tools/backup_tool/BUILD.gn b/tools/backup_tool/BUILD.gn index f27c0d80e..2f1dd8abb 100644 --- a/tools/backup_tool/BUILD.gn +++ b/tools/backup_tool/BUILD.gn @@ -31,11 +31,17 @@ ohos_executable("backup_tool") { include_dirs = [ "include" ] - external_deps = [ "hitrace:hitrace_meter" ] + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "hitrace:hitrace_meter", + "ipc:ipc_core", + ] deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils/:backup_utils", + "${path_jsoncpp}:jsoncpp", ] use_exceptions = true diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 49a013ea2..ede7b71a9 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -77,12 +77,10 @@ ohos_shared_library("backup_utils") { configs = [ ":utils_private_config" ] public_configs = [ ":utils_public_config" ] - external_deps = [ "faultloggerd:libdfx_dumpcatcher" ] - - public_deps = [ - "${path_bas_hiviewdfx_hilog}/interfaces/native/innerkits:libhilog", - "${path_base}:utils", - "${path_jsoncpp}:jsoncpp", + external_deps = [ + "c_utils:utils", + "faultloggerd:libdfx_dumpcatcher", + "hilog:libhilog", ] include_dirs = [ @@ -97,6 +95,7 @@ ohos_shared_library("backup_utils") { ":backup_cxx_gen", ":backup_cxx_rust", "${path_init}/interfaces/innerkits:libbegetutil", + "${path_jsoncpp}:jsoncpp", ] use_exceptions = true -- Gitee