From ed625ec77ac73eb8ad2f5e9a0a2346c1324cb789 Mon Sep 17 00:00:00 2001 From: qianyong325 Date: Mon, 11 Aug 2025 16:43:18 +0800 Subject: [PATCH] refix include absolute header Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICSE0P Signed-off-by: qianyong325 --- es2panda/BUILD.gn | 24 +++++++++++++++++++++++- merge_abc/BUILD.gn | 3 --- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/es2panda/BUILD.gn b/es2panda/BUILD.gn index c50e8e8434..07fa89a69d 100644 --- a/es2panda/BUILD.gn +++ b/es2panda/BUILD.gn @@ -429,9 +429,17 @@ ohos_static_library("es2panda_lib") { "//third_party/icu/icu4c/source/common", "//third_party/icu/icu4c/source/i18n", "//third_party/icu/icu4c/source", + "$ark_root/assembler", + "$ark_root/libpandabase", + "$ark_root/libpandabase/mem", ] } else { - external_deps += [ "icu:static_icuuc" ] + external_deps += [ + "icu:static_icuuc", + "runtime_core:arkassembler_public_headers", + "runtime_core:arkbase_public_headers", + "runtime_core:arkfile_public_headers", + ] } if (!is_arkui_x) { @@ -518,6 +526,20 @@ ohos_executable("es2panda") { "zlib:libz", sdk_libc_secshared_dep, ] + if (ark_standalone_build || (defined(is_arkui_x) && is_arkui_x)) { + include_dirs += [ + "$ark_root/assembler", + "$ark_root/libpandabase", + "$ark_root/libpandabase/mem", + ] + } else { + external_deps += [ + "icu:static_icuuc", + "runtime_core:arkassembler_public_headers", + "runtime_core:arkbase_public_headers", + "runtime_core:arkfile_public_headers", + ] + } if (defined(ohos_indep_compiler_enable) && ohos_indep_compiler_enable) { external_deps += [ diff --git a/merge_abc/BUILD.gn b/merge_abc/BUILD.gn index 27ebcc75c1..29449966d7 100644 --- a/merge_abc/BUILD.gn +++ b/merge_abc/BUILD.gn @@ -45,9 +45,6 @@ protobuf_snapshot_generator_sources = [ config("panda_assembly_proto_public_config") { include_dirs = [ - "$ark_root/assembler", - "$ark_root/libpandabase", - "$ark_root/libpandabase/mem", "$ark_root", "src", "$proto_out_dir", -- Gitee