From 1b90539dcbf181862dbf7fb0a1efe0bc354a9da9 Mon Sep 17 00:00:00 2001 From: y30045862 Date: Wed, 14 Jun 2023 10:32:04 +0800 Subject: [PATCH] =?UTF-8?q?app=5Ffile=5Fservice=E9=83=A8=E7=BD=B2=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E6=95=B4=E6=94=B9=20Signed-off-by:=20yangjingbo10=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1cc7a8e720442bc0f56d58e26717ccda67f2696b --- bundle.json | 33 ++++++++++--------- frameworks/native/backup_ext/BUILD.gn | 4 +-- services/backup_sa/BUILD.gn | 6 ++-- tests/unittests/backup_sa/module_ipc/BUILD.gn | 8 ++--- tools/backup_tool/BUILD.gn | 10 +++--- 5 files changed, 33 insertions(+), 28 deletions(-) diff --git a/bundle.json b/bundle.json index 36e9a215b..58a13df90 100644 --- a/bundle.json +++ b/bundle.json @@ -19,29 +19,32 @@ ], "deps": { "components": [ + "ability_base", + "ability_runtime", + "access_token", "bundle_framework", - "hitrace_native", - "file_api", + "common", + "common_event_service", "c_utils", + "data_share", + "distributeddatamgr", + "faultloggerd", + "file_api", + "hitrace_native", + "hiviewdfx_hilog_native", "ipc", "init", - "bounds_checking_function", - "hiviewdfx_hilog_native", - "access_token", - "faultloggerd", - "common_event_service", - "ability_runtime", - "ability_base", - "storage_service", - "samgr", "napi", "safwk", - "data_share" + "samgr", + "storage_service" + ], + "third_party": [ + "bounds_checking_function", + "jsoncpp" ] }, - "adapted_system_type": [ - "standard" - ], + "adapted_system_type": [ "small", "standard" ], "rom": "1024KB", "ram": "1024KB", "build": { diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn index 1a0e6fc48..ca0b73161 100644 --- a/frameworks/native/backup_ext/BUILD.gn +++ b/frameworks/native/backup_ext/BUILD.gn @@ -37,7 +37,7 @@ ohos_shared_library("backup_extension_ability_native") { ] deps = [ - "${path_ability_runtime}/frameworks/native/appkit:appkit_native", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", ] @@ -46,9 +46,9 @@ ohos_shared_library("backup_extension_ability_native") { "ability_runtime:ability_context_native", "ability_runtime:abilitykit_native", "ability_runtime:app_context", + "ability_runtime:appkit_native", "ability_runtime:runtime", "access_token:libaccesstoken_sdk", - "app_file_service:backup_kit_inner", "bundle_framework:appexecfwk_core", ] diff --git a/services/backup_sa/BUILD.gn b/services/backup_sa/BUILD.gn index d065d2e5b..1c5e1f693 100644 --- a/services/backup_sa/BUILD.gn +++ b/services/backup_sa/BUILD.gn @@ -35,13 +35,15 @@ ohos_shared_library("backup_sa") { include_dirs = [ "include" ] - deps = [ "${path_backup}/utils:backup_utils" ] + deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/utils:backup_utils", + ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", - "app_file_service:backup_kit_inner", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "init:libbegetutil", diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index c37364af1..b341d3a01 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -32,6 +32,7 @@ ohos_unittest("module_ipc_test") { ] deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/services/backup_sa:backup_sa", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", @@ -41,7 +42,6 @@ ohos_unittest("module_ipc_test") { external_deps = [ "ability_base:want", "ability_runtime:ability_manager", - "app_file_service:backup_kit_inner", "c_utils:utils", "safwk:system_ability_fwk", "samgr:samgr_proxy", @@ -73,6 +73,7 @@ ohos_unittest("backup_service_test") { ] deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -81,7 +82,6 @@ ohos_unittest("backup_service_test") { external_deps = [ "ability_base:want", "ability_runtime:ability_manager", - "app_file_service:backup_kit_inner", "init:libbegetutil", "safwk:system_ability_fwk", "samgr:samgr_proxy", @@ -114,6 +114,7 @@ ohos_unittest("backup_service_session_test") { ] deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -122,7 +123,6 @@ ohos_unittest("backup_service_session_test") { external_deps = [ "ability_base:want", "ability_runtime:ability_manager", - "app_file_service:backup_kit_inner", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -154,6 +154,7 @@ ohos_unittest("backup_service_scheduler_test") { ] deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -162,7 +163,6 @@ ohos_unittest("backup_service_scheduler_test") { external_deps = [ "ability_base:want", "ability_runtime:ability_manager", - "app_file_service:backup_kit_inner", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "safwk:system_ability_fwk", diff --git a/tools/backup_tool/BUILD.gn b/tools/backup_tool/BUILD.gn index 691437a6d..50960b764 100644 --- a/tools/backup_tool/BUILD.gn +++ b/tools/backup_tool/BUILD.gn @@ -31,12 +31,12 @@ ohos_executable("backup_tool") { include_dirs = [ "include" ] - external_deps = [ - "app_file_service:backup_kit_inner", - "hitrace_native:hitrace_meter", - ] + external_deps = [ "hitrace_native:hitrace_meter" ] - deps = [ "${path_backup}/utils/:backup_utils" ] + deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/utils/:backup_utils", + ] use_exceptions = true install_enable = true -- Gitee