From 314b4d69ba8a96be5f731eac1fd8d6431bfcff59 Mon Sep 17 00:00:00 2001 From: Rokashevich Svetlana Date: Thu, 17 Apr 2025 19:11:54 +0300 Subject: [PATCH] Change ace_napi dep for ark_hybrid Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICGHB6 Signed-off-by: Rokashevich Svetlana Change-Id: I941c12215e3f9fd1625f597efeabd0ceebda1775 --- BUILD.gn | 6 +++++- interfaces/inner_api/cjffi/ark_interop/BUILD.gn | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 77628490c..01efc4775 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -199,7 +199,6 @@ ohos_source_set("ace_napi_static") { configs += [ "${ets_runtime_path}:ark_jsruntime_public_config" ] } else { external_deps += [ - "ets_runtime:libark_jsruntime", "icu:shared_icui18n", "icu:shared_icuuc", "libuv:uv", @@ -207,6 +206,11 @@ ohos_source_set("ace_napi_static") { if (!ark_standalone_build) { external_deps += [ "node:node_header_notice" ] } + if (defined(ark_hybrid) && ark_hybrid) { + external_deps += [ "runtime_core:libarkruntime" ] + } else { + external_deps += [ "ets_runtime:libark_jsruntime" ] + } } cflags_cc = [ "-Wno-missing-braces" ] diff --git a/interfaces/inner_api/cjffi/ark_interop/BUILD.gn b/interfaces/inner_api/cjffi/ark_interop/BUILD.gn index c09ff8dc3..0db8ecf9b 100644 --- a/interfaces/inner_api/cjffi/ark_interop/BUILD.gn +++ b/interfaces/inner_api/cjffi/ark_interop/BUILD.gn @@ -83,7 +83,12 @@ ohos_shared_library("ark_interop") { "../../../..:ace_napi", ] - external_deps = [ "ets_runtime:libark_jsruntime" ] + external_deps = [] + if (defined(ark_hybrid) && ark_hybrid) { + external_deps += [ "runtime_core:libarkruntime" ] + } else { + external_deps += [ "ets_runtime:libark_jsruntime" ] + } if (!ark_standalone_build) { external_deps += [ "hilog:libhilog" ] -- Gitee