From 79d139cadb4843d27540bd0aa2ab63f0422fceef 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 09:03:39 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- foundations/BUILD.gn | 6 ++++++ interfaces/inner_api/engine/BUILD.gn | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/foundations/BUILD.gn b/foundations/BUILD.gn index 209453af..59d79794 100644 --- a/foundations/BUILD.gn +++ b/foundations/BUILD.gn @@ -42,6 +42,12 @@ ohos_shared_library("update_foundations") { public_configs = [ ":update_service_foundations_config" ] + cflags = [ + "-fPIC", + "-Os", + "-Werror", + ] + innerapi_tags = [ "platformsdk" ] part_name = "$updateengine_part_name" subsystem_name = "updater" diff --git a/interfaces/inner_api/engine/BUILD.gn b/interfaces/inner_api/engine/BUILD.gn index 9dcd2bb1..30b88b67 100644 --- a/interfaces/inner_api/engine/BUILD.gn +++ b/interfaces/inner_api/engine/BUILD.gn @@ -81,6 +81,13 @@ ohos_shared_library("$updateengine_inner_library_name") { if (ability_ability_runtime_enable) { external_deps += [ "ability_runtime:extension_manager" ] } + + cflags = [ + "-fPIC", + "-Os", + "-Werror", + ] + innerapi_tags = [ "platformsdk" ] part_name = "$updateengine_part_name" subsystem_name = "updater" -- Gitee From 7e78dcd2cd735e55f3ae38df915e435c965aedfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Sat, 14 Sep 2024 08:38:14 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- foundations/BUILD.gn | 7 ------ foundations/ability/log/log.gni | 5 ++--- frameworks/js/napi/update/BUILD.gn | 33 +++++++++++----------------- interfaces/inner_api/engine/BUILD.gn | 7 +----- services/engine/engine_sa.gni | 2 -- 5 files changed, 16 insertions(+), 38 deletions(-) diff --git a/foundations/BUILD.gn b/foundations/BUILD.gn index 59d79794..051d3106 100644 --- a/foundations/BUILD.gn +++ b/foundations/BUILD.gn @@ -42,13 +42,6 @@ ohos_shared_library("update_foundations") { public_configs = [ ":update_service_foundations_config" ] - cflags = [ - "-fPIC", - "-Os", - "-Werror", - ] - - innerapi_tags = [ "platformsdk" ] part_name = "$updateengine_part_name" subsystem_name = "updater" } diff --git a/foundations/ability/log/log.gni b/foundations/ability/log/log.gni index 787485b6..8f7409c9 100644 --- a/foundations/ability/log/log.gni +++ b/foundations/ability/log/log.gni @@ -19,6 +19,5 @@ update_log_external_deps = [ ] update_log_deps = [] update_log_include = - [ "$updateengine_root_path/foundations/ability/log/include" ] -update_log_src = - [ "$updateengine_root_path/foundations/ability/log/src/update_log.cpp" ] +[ "$updateengine_root_path/foundations/ability/log/include" ] +update_log_src = [ "$updateengine_root_path/foundations/ability/log/src/update_log.cpp" ] diff --git a/frameworks/js/napi/update/BUILD.gn b/frameworks/js/napi/update/BUILD.gn index 0d7b70f1..6da69b06 100644 --- a/frameworks/js/napi/update/BUILD.gn +++ b/frameworks/js/napi/update/BUILD.gn @@ -16,21 +16,18 @@ import("../../../../updateengine.gni") import("../session/update_session.gni") ohos_shared_library("$updateengine_client_library_name") { - sources = [] - if (ability_ability_runtime_enable) { - 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 - } + 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", @@ -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 30b88b67..da2cfbe1 100644 --- a/interfaces/inner_api/engine/BUILD.gn +++ b/interfaces/inner_api/engine/BUILD.gn @@ -64,6 +64,7 @@ ohos_shared_library("$updateengine_inner_library_name") { ] external_deps = [ + "ability_runtime:ability_manager", "bounds_checking_function:libsec_static", "c_utils:utils", # sptr "hilog:libhilog", @@ -82,12 +83,6 @@ ohos_shared_library("$updateengine_inner_library_name") { external_deps += [ "ability_runtime:extension_manager" ] } - cflags = [ - "-fPIC", - "-Os", - "-Werror", - ] - 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 52244828e55d3ffd7d9c9158aac29e5f1a19d32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Sat, 14 Sep 2024 08:42:53 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=AE=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- interfaces/inner_api/engine/BUILD.gn | 4 ---- 1 file changed, 4 deletions(-) diff --git a/interfaces/inner_api/engine/BUILD.gn b/interfaces/inner_api/engine/BUILD.gn index da2cfbe1..4622d516 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", @@ -82,7 +79,6 @@ ohos_shared_library("$updateengine_inner_library_name") { if (ability_ability_runtime_enable) { external_deps += [ "ability_runtime:extension_manager" ] } - innerapi_tags = [ "platformsdk" ] part_name = "$updateengine_part_name" subsystem_name = "updater" -- Gitee From c519309e0e216b4247ffb1b9011ec4c92a786d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Sat, 14 Sep 2024 09:41:46 +0000 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- foundations/ability/log/log.gni | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/foundations/ability/log/log.gni b/foundations/ability/log/log.gni index 8f7409c9..787485b6 100644 --- a/foundations/ability/log/log.gni +++ b/foundations/ability/log/log.gni @@ -19,5 +19,6 @@ update_log_external_deps = [ ] update_log_deps = [] update_log_include = -[ "$updateengine_root_path/foundations/ability/log/include" ] -update_log_src = [ "$updateengine_root_path/foundations/ability/log/src/update_log.cpp" ] + [ "$updateengine_root_path/foundations/ability/log/include" ] +update_log_src = + [ "$updateengine_root_path/foundations/ability/log/src/update_log.cpp" ] -- Gitee