From 934b4c1706b3ce7700074c3e621e9992860f717f Mon Sep 17 00:00:00 2001
From: handyohos <zhangxiaotian@huawei.com>
Date: Sat, 25 Dec 2021 14:47:27 +0800
Subject: [PATCH] fix: Fix hilog failed error.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

回退保留libfile和libsocket给hilog使用。

Signed-off-by: handyohos <zhangxiaotian@huawei.com>
Change-Id: Ib302be6986ea8cda27101d52d759192e3278a6da
---
 interfaces/innerkits/file/BUILD.gn   | 40 ++++++++++++++++++++++++++
 interfaces/innerkits/socket/BUILD.gn | 42 ++++++++++++++++++++++++++++
 ohos.build                           |  4 ++-
 3 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 interfaces/innerkits/file/BUILD.gn
 create mode 100644 interfaces/innerkits/socket/BUILD.gn

diff --git a/interfaces/innerkits/file/BUILD.gn b/interfaces/innerkits/file/BUILD.gn
new file mode 100644
index 00000000..a3b69e35
--- /dev/null
+++ b/interfaces/innerkits/file/BUILD.gn
@@ -0,0 +1,40 @@
+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build/ohos.gni")
+service_file_sources =
+    [ "//base/startup/init_lite/interfaces/innerkits/file/init_file.c" ]
+service_file_include = [
+  "//base/startup/init_lite/interfaces/innerkits/include",
+  "//base/startup/init_lite/services/log",
+  "//base/startup/init_lite/services/include",
+  "//third_party/bounds_checking_function/include",
+]
+service_file_deps = [
+  "//base/startup/init_lite/services/log:init_log",
+  "//base/startup/init_lite/services/utils:libinit_utils",
+  "//third_party/bounds_checking_function:libsec_static",
+]
+
+ohos_static_library("libfile_static") {
+  sources = service_file_sources
+  include_dirs = service_file_include
+  deps = service_file_deps
+}
+
+ohos_shared_library("libfile") {
+  sources = service_file_sources
+  include_dirs = service_file_include
+  deps = service_file_deps
+  part_name = "init"
+  install_images = [ "system" ]
+}
diff --git a/interfaces/innerkits/socket/BUILD.gn b/interfaces/innerkits/socket/BUILD.gn
new file mode 100644
index 00000000..273c04d5
--- /dev/null
+++ b/interfaces/innerkits/socket/BUILD.gn
@@ -0,0 +1,42 @@
+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+service_socket_sources =
+    [ "//base/startup/init_lite/interfaces/innerkits/socket/init_socket.c" ]
+service_socket_include = [
+  "//base/startup/init_lite/interfaces/innerkits/include",
+  "//base/startup/init_lite/services/log",
+  "//third_party/bounds_checking_function/include",
+]
+service_socket_deps = [
+  "//base/startup/init_lite/services/log:init_log",
+  "//third_party/bounds_checking_function:libsec_static",
+]
+
+ohos_static_library("libsocket_static") {
+  sources = service_socket_sources
+  include_dirs = service_socket_include
+  deps = service_socket_deps
+}
+
+ohos_shared_library("libsocket") {
+  sources = service_socket_sources
+  include_dirs = service_socket_include
+  deps = service_socket_deps
+  part_name = "init"
+  install_images = [
+    "system",
+    "updater",
+  ]
+}
diff --git a/ohos.build b/ohos.build
index d3f5d5dd..673b8de0 100755
--- a/ohos.build
+++ b/ohos.build
@@ -7,7 +7,9 @@
         "//base/startup/init_lite/ueventd:startup_ueventd",
         "//base/startup/init_lite/watchdog:watchdog",
         "//base/startup/init_lite/services/begetctl:begetctl",
-        "//base/startup/init_lite/interfaces/innerkits:libbegetutil"
+        "//base/startup/init_lite/interfaces/innerkits:libbegetutil",
+        "//base/startup/init_lite/interfaces/innerkits/file:libfile",
+        "//base/startup/init_lite/interfaces/innerkits/socket:libsocket"
       ],
       "inner_kits": [{
         "header": {
-- 
GitLab