From ceca06969e2527b6c246d77db1d4465bbabd7625 Mon Sep 17 00:00:00 2001 From: chensihan Date: Fri, 28 Feb 2025 09:46:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=20Sign?= =?UTF-8?q?ed-off-by:=20chensihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bundle.json | 3 +++ interfaces/kits/js/BUILD.gn | 3 +++ services/backup_sa/BUILD.gn | 1 + 3 files changed, 7 insertions(+) diff --git a/bundle.json b/bundle.json index d81e5f73a..d3df192d0 100644 --- a/bundle.json +++ b/bundle.json @@ -31,11 +31,14 @@ "device_manager", "faultloggerd", "file_api", + "form_fwk", "hitrace", "hilog", "hisysevent", "ipc", + "image_framework", "init", + "input", "napi", "safwk", "samgr", diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 16db36cef..1c393d87c 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -45,6 +45,7 @@ ohos_shared_library("fileshare") { external_deps = [ "ability_base:want", "ability_base:zuri", + "ability_runtime:ability_connect_callback_stub", "ability_runtime:abilitykit_native", "ability_runtime:extensionkit_native", "ability_runtime:uri_permission_mgr", @@ -58,9 +59,11 @@ ohos_shared_library("fileshare") { "file_api:filemgmt_libhilog", "file_api:filemgmt_libn", "file_api:remote_uri_native", + "form_fwk:form_manager", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", + "input:libmmi-client", "napi:ace_napi", ] defines = [] diff --git a/services/backup_sa/BUILD.gn b/services/backup_sa/BUILD.gn index 8c877bed7..b01474f61 100644 --- a/services/backup_sa/BUILD.gn +++ b/services/backup_sa/BUILD.gn @@ -76,6 +76,7 @@ ohos_shared_library("backup_sa") { "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", + "image_framework:image_native", "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", -- Gitee From 37c103e2cd2a08f24a81181e7faeb3c0348cf7f8 Mon Sep 17 00:00:00 2001 From: chensihan Date: Fri, 28 Feb 2025 02:34:59 +0000 Subject: [PATCH 2/5] update interfaces/kits/js/BUILD.gn. Signed-off-by: chensihan --- interfaces/kits/js/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 1c393d87c..c0afd71a6 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -62,8 +62,8 @@ ohos_shared_library("fileshare") { "form_fwk:form_manager", "hilog:libhilog", "init:libbegetutil", - "ipc:ipc_core", "input:libmmi-client", + "ipc:ipc_core", "napi:ace_napi", ] defines = [] -- Gitee From 013869a8f7634566f6ce5325c3833b52d5f70843 Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 6 Mar 2025 01:25:14 +0000 Subject: [PATCH 3/5] update interfaces/kits/js/BUILD.gn. Signed-off-by: chensihan --- interfaces/kits/js/BUILD.gn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index c0afd71a6..fa634ba26 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -59,7 +59,6 @@ ohos_shared_library("fileshare") { "file_api:filemgmt_libhilog", "file_api:filemgmt_libn", "file_api:remote_uri_native", - "form_fwk:form_manager", "hilog:libhilog", "init:libbegetutil", "input:libmmi-client", @@ -74,6 +73,9 @@ ohos_shared_library("fileshare") { "ABILITY_RUNTIME_FEATURE_SANDBOXMANAGER", ] } + if (form_fwk_enable) { + external_deps += [ "form_fwk:form_manager" ] + } relative_install_dir = "module" part_name = "app_file_service" -- Gitee From 687e78f27d4158b27b8f55f0797fae2b24109616 Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 6 Mar 2025 01:53:24 +0000 Subject: [PATCH 4/5] update interfaces/kits/js/BUILD.gn. Signed-off-by: chensihan --- interfaces/kits/js/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index fa634ba26..1d1ad9125 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -73,7 +73,7 @@ ohos_shared_library("fileshare") { "ABILITY_RUNTIME_FEATURE_SANDBOXMANAGER", ] } - if (form_fwk_enable) { + if (form_fwk) { external_deps += [ "form_fwk:form_manager" ] } relative_install_dir = "module" -- Gitee From 6d2f1f3bf0245a1b101e326e5b3e48f02c73e0bf Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 6 Mar 2025 01:54:08 +0000 Subject: [PATCH 5/5] update app_file_service.gni. Signed-off-by: chensihan --- app_file_service.gni | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app_file_service.gni b/app_file_service.gni index 8a4903504..52f53d55b 100644 --- a/app_file_service.gni +++ b/app_file_service.gni @@ -18,8 +18,13 @@ path_napi = "//foundation/arkui/napi" app_file_service_path = "//foundation/filemanagement/app_file_service" declare_args() { sandbox_manarer = false + form_fwk = false if (defined(global_parts_info) && defined(global_parts_info.accesscontrol_sandbox_manager)) { sandbox_manarer = true } + if (defined(global_parts_info) && + defined(global_parts_info.ability_form_fwk)) { + form_fwk = true + } } -- Gitee