From 777ee934b0843c9dd208e2a591933f710fdd3267 Mon Sep 17 00:00:00 2001 From: qianyong325 Date: Mon, 4 Aug 2025 15:24:41 +0800 Subject: [PATCH] runtime_core alarm rectification Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICQY16?from=project-issue Signed-off-by: qianyong325 --- es2panda/BUILD.gn | 13 ++++++------- merge_abc/BUILD.gn | 7 +++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/es2panda/BUILD.gn b/es2panda/BUILD.gn index 56f0a55564..297128cdea 100644 --- a/es2panda/BUILD.gn +++ b/es2panda/BUILD.gn @@ -465,11 +465,11 @@ ohos_static_library("es2panda_lib") { "-Wno-c++20-designator", "-Wno-implicit-fallthrough", ] + if (enable_hilog) { + external_deps += [ "hilog:libhilog" ] + } if (defined(ohos_indep_compiler_enable) && ohos_indep_compiler_enable) { external_deps += [ "runtime_core:libarkassembler_static" ] - if (enable_hilog) { - external_deps += [ "hilog:libhilog" ] - } cflags += [ "-I" + rebase_path( "$root_build_dir/gen/arkcompiler/runtime_core/compiler/generated") ] } @@ -507,16 +507,15 @@ ohos_executable("es2panda") { "zlib:libz", sdk_libc_secshared_dep, ] - + if (enable_hilog) { + external_deps += [ "hilog:libhilog" ] + } if (defined(ohos_indep_compiler_enable) && ohos_indep_compiler_enable) { external_deps += [ "abseil-cpp:absl_base_static", "icu:shared_icuuc", "runtime_core:libarkassembler_static", ] - if (enable_hilog) { - external_deps += [ "hilog:libhilog" ] - } cflags = [ "-Wno-constant-conversion", "-I" + rebase_path( diff --git a/merge_abc/BUILD.gn b/merge_abc/BUILD.gn index 27ebcc75c1..02416b0724 100644 --- a/merge_abc/BUILD.gn +++ b/merge_abc/BUILD.gn @@ -186,16 +186,15 @@ ohos_source_set("assembly_proto_static") { "$ark_third_party_root/protobuf:protobuf_static", ] } - + if (enable_hilog) { + external_deps += [ "hilog:libhilog" ] + } if (!ark_standalone_build && !is_arkui_x) { external_deps += [ "runtime_core:arkassembler_public_headers", "runtime_core:arkbase_public_headers", "runtime_core:arkfile_public_headers", ] - if (enable_hilog) { - external_deps += [ "hilog:libhilog" ] - } } if (defined(ohos_indep_compiler_enable) && ohos_indep_compiler_enable) { -- Gitee