From 48e6df76ee637f94b7fd2306834e2110463e0148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F=E6=98=8A?= Date: Sat, 29 Jun 2024 11:04:35 +0000 Subject: [PATCH 1/2] fix: Modify format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨鹏昊 --- frameworks/js/napi/update/BUILD.gn | 2 ++ services/engine/engine_sa.gni | 2 ++ 2 files changed, 4 insertions(+) diff --git a/frameworks/js/napi/update/BUILD.gn b/frameworks/js/napi/update/BUILD.gn index a9624f52..10d247db 100644 --- a/frameworks/js/napi/update/BUILD.gn +++ b/frameworks/js/napi/update/BUILD.gn @@ -46,6 +46,8 @@ ohos_shared_library("$updateengine_client_library_name") { external_deps = [ "c_utils:utils", # sptr "hilog:libhilog", + "json:nlohmann_json_static", + "ipc:ipc_core", ] if (ability_ability_runtime_enable) { diff --git a/services/engine/engine_sa.gni b/services/engine/engine_sa.gni index 08d97178..713530b7 100644 --- a/services/engine/engine_sa.gni +++ b/services/engine/engine_sa.gni @@ -142,6 +142,8 @@ sa_external_deps = [ "updater:libfsmanager", # "fs_manager/mount.h" "updater:libpackage_shared", # "package/package.h" "updater:libupdater_shared", # "updaterkits/updaterkits.h" + "bundle_framework:appexecfwk_core", + "ability_base:session_info", ] if (ability_ability_base_enable) { -- Gitee From 4e880e34b38627a5c641dfaa8a0ed54e6cc7deb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F=E6=98=8A?= Date: Mon, 1 Jul 2024 02:43:45 +0000 Subject: [PATCH 2/2] fix: Adjust gn order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨鹏昊 --- frameworks/js/napi/update/BUILD.gn | 2 +- services/engine/engine_sa.gni | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/js/napi/update/BUILD.gn b/frameworks/js/napi/update/BUILD.gn index 10d247db..b0fbb66f 100644 --- a/frameworks/js/napi/update/BUILD.gn +++ b/frameworks/js/napi/update/BUILD.gn @@ -46,8 +46,8 @@ ohos_shared_library("$updateengine_client_library_name") { external_deps = [ "c_utils:utils", # sptr "hilog:libhilog", - "json:nlohmann_json_static", "ipc:ipc_core", + "json:nlohmann_json_static", ] if (ability_ability_runtime_enable) { diff --git a/services/engine/engine_sa.gni b/services/engine/engine_sa.gni index 713530b7..15f808bd 100644 --- a/services/engine/engine_sa.gni +++ b/services/engine/engine_sa.gni @@ -123,8 +123,10 @@ 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", @@ -142,8 +144,6 @@ sa_external_deps = [ "updater:libfsmanager", # "fs_manager/mount.h" "updater:libpackage_shared", # "package/package.h" "updater:libupdater_shared", # "updaterkits/updaterkits.h" - "bundle_framework:appexecfwk_core", - "ability_base:session_info", ] if (ability_ability_base_enable) { -- Gitee