From c1ddceade9eb6825551ab9133a895aea04aaba97 Mon Sep 17 00:00:00 2001
From: handyohos <zhangxiaotian@huawei.com>
Date: Sun, 26 Dec 2021 11:56:52 +0800
Subject: [PATCH] fix: Remove libfile and libsocket from hilog.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

去除libhilogutil对libfile和libsocket的依赖，仅在hilogd中依赖libbegetutil。

Signed-off-by: handyohos <zhangxiaotian@huawei.com>
Change-Id: Ic5bcaca8e9711de416049f5759d55ce3288e27ff
---
 frameworks/native/BUILD.gn | 29 +++++++++++++++++++++++------
 services/hilogd/BUILD.gn   |  9 ++++-----
 2 files changed, 27 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 frameworks/native/BUILD.gn

diff --git a/frameworks/native/BUILD.gn b/frameworks/native/BUILD.gn
old mode 100644
new mode 100755
index 811f6bd..c4954d8
--- a/frameworks/native/BUILD.gn
+++ b/frameworks/native/BUILD.gn
@@ -32,7 +32,6 @@ ohos_source_set("libhilog_source") {
   sources = [
     "hilog.cpp",
     "hilog_input_socket_client.cpp",
-    "hilog_input_socket_server.cpp",
     "hilog_printf.cpp",
     "vsnprintf_s_p.cpp",
   ]
@@ -55,22 +54,41 @@ config("libhilogutil_config") {
     "//base/hiviewdfx/hilog/adapter",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
   ]
+}
+
+ohos_static_library("libhilog_socket_server") {
+  sources = [
+    "dgram_socket_server.cpp",
+    "hilog_input_socket_server.cpp",
+    "seq_packet_socket_server.cpp",
+    "socket_server.cpp",
+  ]
+  public_configs = [ ":libhilogutil_config" ]
+  configs = [ ":libhilogutil_config" ]
+
+  deps = [
+    "//base/hiviewdfx/hilog/adapter:libhilog_os_adapter",
+    "//third_party/bounds_checking_function:libsec_shared",
+  ]
 
+  defines = [ "HILOG_DEFAULT_PRIVACY=$ohos_hilog_default_privacy" ]
+  defines += [ "__RECV_MSG_WITH_UCRED_" ]
   if (use_musl) {
-    include_dirs += [ "//base/startup/init_lite/interfaces/innerkits/include" ]
+    defines += [ "HILOG_USE_MUSL" ]
+    external_deps = [ "init:libbegetutil" ]
   }
+
+  part_name = "hilog_native"
+  subsystem_name = "hiviewdfx"
 }
 
 ohos_shared_library("libhilogutil") {
   sources = [
     "dgram_socket_client.cpp",
-    "dgram_socket_server.cpp",
     "format.cpp",
     "seq_packet_socket_client.cpp",
-    "seq_packet_socket_server.cpp",
     "socket.cpp",
     "socket_client.cpp",
-    "socket_server.cpp",
   ]
   public_configs = [ ":libhilogutil_config" ]
   configs = [ ":libhilogutil_config" ]
@@ -82,7 +100,6 @@ ohos_shared_library("libhilogutil") {
 
   if (use_musl) {
     defines = [ "HILOG_USE_MUSL" ]
-    deps += [ "//base/startup/init_lite/interfaces/innerkits/socket:libsocket" ]
   }
 
   output_extension = "so"
diff --git a/services/hilogd/BUILD.gn b/services/hilogd/BUILD.gn
index a295b7e..46d3cf4 100644
--- a/services/hilogd/BUILD.gn
+++ b/services/hilogd/BUILD.gn
@@ -16,10 +16,7 @@ import("//build/ohos.gni")
 config("hilogd_config") {
   visibility = [ ":*" ]
 
-  include_dirs = [
-    "include",
-    "//base/startup/init_lite/interfaces/innerkits/include",
-  ]
+  include_dirs = [ "include" ]
 }
 
 ohos_executable("hilogd") {
@@ -41,9 +38,9 @@ ohos_executable("hilogd") {
   defines = [ "__RECV_MSG_WITH_UCRED_" ]
   deps = [
     "//base/hiviewdfx/hilog/adapter:libhilog_os_adapter",
+    "//base/hiviewdfx/hilog/frameworks/native:libhilog_socket_server",
     "//base/hiviewdfx/hilog/frameworks/native:libhilogutil",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
-    "//base/startup/init_lite/interfaces/innerkits/file:libfile",
     "//third_party/bounds_checking_function:libsec_shared",
     "//third_party/zlib:libz",
     "//utils/native/base:utilsecurec_shared",
@@ -51,6 +48,8 @@ ohos_executable("hilogd") {
 
   deps += [ "etc:hilogd_etc" ]
 
+  external_deps = [ "init:libbegetutil" ]
+
   install_enable = true
   part_name = "hilog_service"
   subsystem_name = "hiviewdfx"
-- 
Gitee