From 9eabb62580e69c15611e573d3809ef1d75fe6eef Mon Sep 17 00:00:00 2001
From: liujialiang <liujialiang10@huawei.com>
Date: Fri, 7 Apr 2023 15:44:56 +0800
Subject: [PATCH] Merge ios library to common library 1.Delete independent
 library for ios. 2.Separate common static library(utilsbase) for different
 platform.

Signed-off-by: liujialiang <liujialiang10@huawei.com>
---
 base/BUILD.gn | 66 ++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 3e20bfd..18a37fa 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -88,18 +88,38 @@ sources_utils = [
   "src/rwlock.cpp",
 ]
 
+if (current_os == "ios") {
+  sources_utils_ios = [
+    "src/directory_ex.cpp",
+    "src/parcel.cpp",
+    "src/refbase.cpp",
+    "src/rwlock.cpp",
+    "src/string_ex.cpp",
+  ]
+}
+
 ohos_static_library("utilsbase") {
-  sources = sources_utils
-  configs = [ ":utils_coverage_config" ]
-  all_dependent_configs = [ ":utils_all_dependent_configs" ]
-  if (current_os != "android" && current_os != "ios") {
-    defines = [ "CONFIG_HILOG" ]
-  }
-  external_deps = [ "hilog_native:libhilog_base" ]
-  public_deps = [ "//third_party/bounds_checking_function:libsec_static" ]
+  if (current_os == "ios") {
+    sources = sources_utils_ios
+    configs = [ ":utils_coverage_config" ]
+    all_dependent_configs = [ ":utils_all_dependent_configs" ]
+    public_deps = [ "//third_party/bounds_checking_function:libsec_static" ]
 
-  subsystem_name = "commonlibrary"
-  part_name = "c_utils"
+    subsystem_name = "commonlibrary"
+    part_name = "c_utils"
+  } else {
+    sources = sources_utils
+    configs = [ ":utils_coverage_config" ]
+    all_dependent_configs = [ ":utils_all_dependent_configs" ]
+    if (current_os != "android" && current_os != "ios") {
+      defines = [ "CONFIG_HILOG" ]
+    }
+    external_deps = [ "hilog_native:libhilog_base" ]
+    public_deps = [ "//third_party/bounds_checking_function:libsec_static" ]
+
+    subsystem_name = "commonlibrary"
+    part_name = "c_utils"
+  }
 }
 
 ohos_static_library("utilsbase_rtti") {
@@ -117,33 +137,9 @@ ohos_static_library("utilsbase_rtti") {
   part_name = "c_utils"
 }
 
-if (current_os == "ios") {
-  ohos_static_library("utils_staticIOS_PLATFORM") {
-    sources = [
-      "src/directory_ex.cpp",
-      "src/parcel.cpp",
-      "src/refbase.cpp",
-      "src/rwlock.cpp",
-      "src/string_ex.cpp",
-    ]
-    configs = [ ":utils_coverage_config" ]
-    all_dependent_configs = [ ":utils_all_dependent_configs" ]
-    public_deps = [ "//third_party/bounds_checking_function:libsec_static" ]
-
-    subsystem_name = "commonlibrary"
-    part_name = "c_utils"
-  }
-}
-
 ohos_shared_library("utils") {
   if (current_os == "ios") {
-    sources = [
-      "src/directory_ex.cpp",
-      "src/parcel.cpp",
-      "src/refbase.cpp",
-      "src/rwlock.cpp",
-      "src/string_ex.cpp",
-    ]
+    sources = sources_utils_ios
     configs = [ ":utils_coverage_config" ]
     all_dependent_configs = [ ":utils_all_dependent_configs" ]
     public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-- 
Gitee