From e3a4972a48df61dfa73977f74918116b5a237aa3 Mon Sep 17 00:00:00 2001
From: zhuzhihui7 <zhuzhihui7@huawei.com>
Date: Wed, 30 Jul 2025 15:16:25 +0800
Subject: [PATCH] fix include external

Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICPTDQ

Change-Id: I10334baf98b017ab884e3a30e7fefe9526e211f2
Signed-off-by: qianyong325 <qianyong15@h-partners.com>
---
 merge_abc/BUILD.gn | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/merge_abc/BUILD.gn b/merge_abc/BUILD.gn
index a20f2b5607..ac8b0ec763 100644
--- a/merge_abc/BUILD.gn
+++ b/merge_abc/BUILD.gn
@@ -40,10 +40,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",
     "../es2panda",
@@ -54,9 +50,6 @@ config("panda_assembly_proto_public_config") {
 assembly_proto_configs = [
   "$ark_root:ark_config",
   ":panda_assembly_proto_public_config",
-  "$ark_root/assembler:arkassembler_public_config",
-  "$ark_root/libpandabase:arkbase_public_config",
-  "$ark_root/libpandafile:arkfile_public_config",
 ]
 
 if (defined(is_arkui_x) && is_arkui_x) {
@@ -182,6 +175,11 @@ ohos_source_set("assembly_proto_static") {
       external_deps += [ "hilog:libhilog" ]
     }
   }
+  external_deps += [
+    "runtime_core:libarkbase_static",
+    "runtime_core:libarkassembler_static",
+    "runtime_core:libarkfile_static",
+  ]
 
   sources = proto_generated_header + proto_generated_source +
             protobuf_snapshot_generator_sources
@@ -221,9 +219,6 @@ ohos_executable("merge_abc") {
   configs = [
     "$ark_root:ark_config",
     ":panda_assembly_proto_public_config",
-    "$ark_root/assembler:arkassembler_public_config",
-    "$ark_root/libpandabase:arkbase_public_config",
-    "$ark_root/libpandafile:arkfile_public_config",
     ":proto_file_cpp_config",
   ]
 
@@ -233,6 +228,9 @@ ohos_executable("merge_abc") {
   ]
   external_deps = [
     "icu:static_icuuc",
+    "runtime_core:libarkbase_static",
+    "runtime_core:libarkassembler_static",
+    "runtime_core:libarkfile_static",
     sdk_libc_secshared_dep,
   ]
   if (!is_arkui_x) {
-- 
Gitee