From ea5db7e4f943db535fe7d9328623e85744eeca59 Mon Sep 17 00:00:00 2001
From: lijunru <lijunru9@huawei.com>
Date: Mon, 16 Jun 2025 19:19:58 +0800
Subject: [PATCH] Component independent compilation

Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICFKLT
Signed-off-by: lijunru <lijunru9@huawei.com>
Change-id: i8658f7929a024ca60305d06334e35c565dcec3f2
---
 inspector/BUILD.gn      |  4 ++--
 inspector/test/BUILD.gn |  2 +-
 tooling/BUILD.gn        |  2 ++
 websocket/BUILD.gn      | 41 ++++++++++++++---------------------------
 websocket/test/BUILD.gn |  2 +-
 5 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/inspector/BUILD.gn b/inspector/BUILD.gn
index 33149f55..607bd80a 100644
--- a/inspector/BUILD.gn
+++ b/inspector/BUILD.gn
@@ -30,7 +30,7 @@ ohos_source_set("ark_debugger_static") {
     libs = [ "log" ]
   }
 
-  deps = [ "../websocket:websocket_server" ]
+  deps = [ "../websocket:libwebsocket_server" ]
   sources = [
     "../common/log_wrapper.cpp",
     "inspector.cpp",
@@ -96,7 +96,7 @@ ohos_source_set("connectserver_debugger_static") {
     external_deps += [ "cJSON:cjson" ]
   }
 
-  deps = [ "../websocket:websocket_server" ]
+  deps = [ "../websocket:libwebsocket_server" ]
   sources = [
     "../common/log_wrapper.cpp",
     "../tooling/base/pt_json.cpp",
diff --git a/inspector/test/BUILD.gn b/inspector/test/BUILD.gn
index 81fe4e91..eb539069 100644
--- a/inspector/test/BUILD.gn
+++ b/inspector/test/BUILD.gn
@@ -31,7 +31,7 @@ host_unittest_action("InspectorConnectTest") {
   deps = [
     "$toolchain_root/inspector:connectserver_debugger",
     "$toolchain_root/websocket:websocket_client",
-    "$toolchain_root/websocket:websocket_server",
+    "$toolchain_root/websocket:libwebsocket_server",
   ]
 
   # hiviewdfx libraries
diff --git a/tooling/BUILD.gn b/tooling/BUILD.gn
index e345de67..5f802647 100644
--- a/tooling/BUILD.gn
+++ b/tooling/BUILD.gn
@@ -70,6 +70,7 @@ ohos_source_set("libark_ecma_debugger_set") {
   external_deps += [
     "icu:shared_icuuc",
     "libuv:uv",
+    sdk_libc_secshared_dep,
   ]
 
   if (is_ohos && is_standard_system && !is_arkui_x) {
@@ -143,6 +144,7 @@ ohos_static_library("libark_ecma_debugger_test") {
     "ets_runtime:libark_jsruntime",
     "icu:shared_icuuc",
     "libuv:uv",
+    sdk_libc_secshared_dep,
   ]
   if ((is_arkui_x && target_os == "ios") || target_os == "mac") {
     external_deps += [ "cJSON:cjson_static" ]
diff --git a/websocket/BUILD.gn b/websocket/BUILD.gn
index 7e9c946e..840158fc 100644
--- a/websocket/BUILD.gn
+++ b/websocket/BUILD.gn
@@ -43,6 +43,14 @@ if (is_arkui_x && target_os == "ios") {
 
 websocket_ext_deps += [ "bounds_checking_function:libsec_shared" ]
 
+websocket_base_source = toolchain_platform_source + [
+                          "frame_builder.cpp",
+                          "handshake_helper.cpp",
+                          "http.cpp",
+                          "network.cpp",
+                          "websocket_base.cpp",
+                        ]
+
 ohos_source_set("websocket_base") {
   stack_protector_ret = true
 
@@ -55,14 +63,7 @@ ohos_source_set("websocket_base") {
     libs = [ "log" ]
   }
 
-  sources = [
-    "frame_builder.cpp",
-    "handshake_helper.cpp",
-    "http.cpp",
-    "network.cpp",
-    "websocket_base.cpp",
-  ]
-  sources += toolchain_platform_source
+  sources = websocket_base_source
 
   subsystem_name = "arkcompiler"
   part_name = "toolchain"
@@ -73,7 +74,10 @@ config("websocket_public_config") {
   include_dirs = [ "$toolchain_root/websocket" ]
 }
 
-ohos_source_set("websocket_server") {
+websocket_server_source =
+    websocket_base_source + [ "server/websocket_server.cpp" ]
+
+ohos_static_library("libwebsocket_server") {
   stack_protector_ret = true
 
   configs = websocket_configs
@@ -81,29 +85,12 @@ ohos_source_set("websocket_server") {
 
   external_deps = websocket_ext_deps
   deps = websocket_deps
-  deps += [ ":websocket_base" ]
 
   if (target_os == "android" && !ark_standalone_build) {
     libs = [ "log" ]
   }
 
-  sources = [ "server/websocket_server.cpp" ]
-
-  subsystem_name = "arkcompiler"
-  part_name = "toolchain"
-}
-
-# required for runtime_core ArkTS inspector
-ohos_static_library("libwebsocket_server") {
-  stack_protector_ret = true
-
-  public_configs = [ ":websocket_public_config" ]
-
-  deps = [ ":websocket_server" ]
-  external_deps = [
-    "bounds_checking_function:libsec_shared",
-    "openssl:libcrypto_shared",
-  ]
+  sources = websocket_server_source
   subsystem_name = "arkcompiler"
   part_name = "toolchain"
 }
diff --git a/websocket/test/BUILD.gn b/websocket/test/BUILD.gn
index 6b58f9b8..c643f227 100644
--- a/websocket/test/BUILD.gn
+++ b/websocket/test/BUILD.gn
@@ -34,7 +34,7 @@ host_unittest_action("WebSocketTest") {
 
   deps = [
     "$toolchain_root/websocket:websocket_client",
-    "$toolchain_root/websocket:websocket_server",
+    "$toolchain_root/websocket:libwebsocket_server",
   ]
 
   # hiviewdfx libraries
-- 
Gitee