From c064424d3fc267466117f66127f0f89acd8c548a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Fri, 13 Sep 2024 11:55:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A55.0-Rel?= =?UTF-8?q?ease=20Signed-off-by:=20=E9=82=B9=E5=8F=8B=E6=9D=BE=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/js/napi/update/BUILD.gn | 11 ++--------- interfaces/inner_api/engine/BUILD.gn | 7 +------ services/engine/engine_sa.gni | 2 -- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/frameworks/js/napi/update/BUILD.gn b/frameworks/js/napi/update/BUILD.gn index 0d7b70f1..db98658c 100644 --- a/frameworks/js/napi/update/BUILD.gn +++ b/frameworks/js/napi/update/BUILD.gn @@ -16,9 +16,7 @@ import("../../../../updateengine.gni") import("../session/update_session.gni") ohos_shared_library("$updateengine_client_library_name") { - sources = [] - if (ability_ability_runtime_enable) { - sources += [ + sources = [ "$updateengine_root_path/frameworks/js/napi/update/common/src/client_helper.cpp", "$updateengine_root_path/frameworks/js/napi/update/common/src/iupdater.cpp", "$updateengine_root_path/frameworks/js/napi/update/src/define_property.cpp", @@ -30,7 +28,6 @@ ohos_shared_library("$updateengine_client_library_name") { "$updateengine_root_path/frameworks/js/napi/update/src/update_session.cpp", ] sources += session_sources - } include_dirs = [ "$updateengine_root_path/frameworks/js/napi/update/common/include", @@ -49,13 +46,9 @@ ohos_shared_library("$updateengine_client_library_name") { "c_utils:utils", # sptr "hilog:libhilog", "ipc:ipc_core", - "json:nlohmann_json_static", + "napi:ace_napi", ] - if (ability_ability_runtime_enable) { - external_deps += [ "napi:ace_napi" ] - } - install_enable = true relative_install_dir = "module" part_name = "$updateengine_part_name" diff --git a/interfaces/inner_api/engine/BUILD.gn b/interfaces/inner_api/engine/BUILD.gn index 9dcd2bb1..70b3cca5 100644 --- a/interfaces/inner_api/engine/BUILD.gn +++ b/interfaces/inner_api/engine/BUILD.gn @@ -41,9 +41,6 @@ ohos_shared_library("$updateengine_inner_library_name") { branch_protector_ret = "pac_ret" defines = [ "DUAL_ADAPTER" ] - if (!ability_ability_runtime_enable) { - defines += [ "ABILITY_RUNTIME_INNER_ENABLE" ] - } sources = [ "$updateengine_root_path/interfaces/inner_api/engine/src/update_callback.cpp", "$updateengine_root_path/interfaces/inner_api/engine/src/update_callback_stub.cpp", @@ -64,6 +61,7 @@ ohos_shared_library("$updateengine_inner_library_name") { ] external_deps = [ + "ability_runtime:extension_manager", "bounds_checking_function:libsec_static", "c_utils:utils", # sptr "hilog:libhilog", @@ -78,9 +76,6 @@ ohos_shared_library("$updateengine_inner_library_name") { deps += feature_deps external_deps += feature_external_deps - if (ability_ability_runtime_enable) { - external_deps += [ "ability_runtime:extension_manager" ] - } innerapi_tags = [ "platformsdk" ] part_name = "$updateengine_part_name" subsystem_name = "updater" diff --git a/services/engine/engine_sa.gni b/services/engine/engine_sa.gni index 15f808bd..08d97178 100644 --- a/services/engine/engine_sa.gni +++ b/services/engine/engine_sa.gni @@ -123,10 +123,8 @@ sa_deps += firmware_deps sa_deps += startup_deps sa_external_deps = [ - "ability_base:session_info", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", - "bundle_framework:appexecfwk_core", "cJSON:cjson", "c_utils:utils", # refbase "curl:curl_shared", -- Gitee From 634ba806f6a7aad926e08ee1b20ff374e278d3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Fri, 13 Sep 2024 04:07:55 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9gn=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- frameworks/js/napi/update/BUILD.gn | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/frameworks/js/napi/update/BUILD.gn b/frameworks/js/napi/update/BUILD.gn index db98658c..6da69b06 100644 --- a/frameworks/js/napi/update/BUILD.gn +++ b/frameworks/js/napi/update/BUILD.gn @@ -17,17 +17,17 @@ import("../session/update_session.gni") ohos_shared_library("$updateengine_client_library_name") { sources = [ - "$updateengine_root_path/frameworks/js/napi/update/common/src/client_helper.cpp", - "$updateengine_root_path/frameworks/js/napi/update/common/src/iupdater.cpp", - "$updateengine_root_path/frameworks/js/napi/update/src/define_property.cpp", - "$updateengine_root_path/frameworks/js/napi/update/src/local_updater.cpp", - "$updateengine_root_path/frameworks/js/napi/update/src/restorer.cpp", - "$updateengine_root_path/frameworks/js/napi/update/src/session_manager.cpp", - "$updateengine_root_path/frameworks/js/napi/update/src/update_client.cpp", - "$updateengine_root_path/frameworks/js/napi/update/src/update_module.cpp", - "$updateengine_root_path/frameworks/js/napi/update/src/update_session.cpp", - ] - sources += session_sources + "$updateengine_root_path/frameworks/js/napi/update/common/src/client_helper.cpp", + "$updateengine_root_path/frameworks/js/napi/update/common/src/iupdater.cpp", + "$updateengine_root_path/frameworks/js/napi/update/src/define_property.cpp", + "$updateengine_root_path/frameworks/js/napi/update/src/local_updater.cpp", + "$updateengine_root_path/frameworks/js/napi/update/src/restorer.cpp", + "$updateengine_root_path/frameworks/js/napi/update/src/session_manager.cpp", + "$updateengine_root_path/frameworks/js/napi/update/src/update_client.cpp", + "$updateengine_root_path/frameworks/js/napi/update/src/update_module.cpp", + "$updateengine_root_path/frameworks/js/napi/update/src/update_session.cpp", + ] + sources += session_sources include_dirs = [ "$updateengine_root_path/frameworks/js/napi/update/common/include", -- Gitee