From c28adc8602ba05fa701c16516b109f5a6ec99c7b Mon Sep 17 00:00:00 2001
From: xieziang <xieziang2@huawei.com>
Date: Thu, 14 Aug 2025 22:03:15 +0800
Subject: [PATCH] remove action dependency

Signed-off-by: xieziang <xieziang2@huawei.com>
---
 ui2abc/gn/command/copy_libs.py | 10 +++++++--
 ui2abc/libarkts/BUILD.gn       | 37 ++++++++++++++++++++++++----------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/ui2abc/gn/command/copy_libs.py b/ui2abc/gn/command/copy_libs.py
index 4d89c8ae69..43fef9e7f1 100755
--- a/ui2abc/gn/command/copy_libs.py
+++ b/ui2abc/gn/command/copy_libs.py
@@ -55,8 +55,13 @@ def copy_output(options):
     copy_files(os.path.join(options.source_path, 'lib'),
                os.path.join(options.output_path, 'lib'))
     
-    copy_files(os.path.join(options.source_path, 'build/native'),
-               os.path.join(options.output_path, 'build/native'), False, False)
+    if options.current_os == "mingw" :
+        copy_files(os.path.join(options.root_out_dir, 'libes2panda_lib.dll'),
+                os.path.join(options.output_path, 'native/build/es2panda.node'), True)
+    
+    if options.current_os == "linux" or options.current_os == "mac" :
+        copy_files(os.path.join(options.root_out_dir, 'libes2panda.node'),
+                os.path.join(options.output_path, 'native/build/es2panda.node'), True)
 
 
 def parse_args():
@@ -64,6 +69,7 @@ def parse_args():
     parser.add_argument('--source_path', help='path to build system source')
     parser.add_argument('--output_path', help='path to output')
     parser.add_argument('--root_out_dir', help='path to root out')
+    parser.add_argument('--current_os', help='current os')
 
     options = parser.parse_args()
     return options
diff --git a/ui2abc/libarkts/BUILD.gn b/ui2abc/libarkts/BUILD.gn
index 8caa9faf93..ec65d56af4 100644
--- a/ui2abc/libarkts/BUILD.gn
+++ b/ui2abc/libarkts/BUILD.gn
@@ -25,8 +25,6 @@ node_version = "v16.20.2"
 host_arch = "${host_os}-${host_cpu}"
 
 shared_library("es2panda_lib") {
-    external_deps = [ "ets_frontend:ets2panda" ]
-
     sources = [
         "$libarkts_root/native/src/common.cc",
         "$libarkts_root/native/src/bridges.cc",
@@ -258,22 +256,39 @@ npm_cmd("libarkts_compile") {
         ":regenerate(${host_toolchain})"
     ]
     outputs = [
-        "$target_out_dir/libarkts.js"
+        "$target_out_dir/libarkts_compile"
     ]
     project_path = rebase_path(".")
     run_tasks = [ "compile:koala:interop", "compile:js" ]
 }
 
-group("es2panda") {
-    deps = [
-        ":es2panda_lib_copy",
-        ":libarkts_compile(${host_toolchain})"
-    ]
+action("copy_libarkts") {
+  script = "../gn/command/copy_libs.py"
+  args = [
+    "--source_path",
+    rebase_path(get_path_info(".", "abspath")),
+    "--output_path",
+    rebase_path("$target_gen_dir"),
+    "--root_out_dir",
+    rebase_path(root_out_dir),
+    "--current_os",
+    "$current_os"
+  ]
+  outputs = [ "$target_gen_dir" ]
+  deps = [
+    ":libarkts_compile(${host_toolchain})",
+    ":es2panda_lib"
+  ]
 }
 
-group("libarkts") {
+ohos_copy("libarkts") {
     deps = [
-      ":es2panda_lib",
-      ":libarkts_compile(${host_toolchain})"
+        ":copy_libarkts"
     ]
+    sources = [ rebase_path("$target_gen_dir") ]
+    outputs = [ target_out_dir + "/$target_name" ]
+    module_source_dir = target_out_dir + "/$target_name"
+    module_install_name = ""
+    subsystem_name = "arkui"
+    part_name = "ace_engine"
 }
\ No newline at end of file
-- 
Gitee