automatic import of dsoftbusopeneuler20.03

1 files changed, 99 insertions, 0 deletions

diff --git a/commonlibrary-c-utils-0001-Adaptation-for-dsoftbus.patch b/commonlibrary-c-utils-0001-Adaptation-for-dsoftbus.patch
new file mode 100644
index 0000000..22229bf
--- /dev/null
+++ b/commonlibrary-c-utils-0001-Adaptation-for-dsoftbus.patch
@@ -0,0 +1,99 @@
+From 1e7842b01138c2313b2d8d8e736f461a9690c027 Mon Sep 17 00:00:00 2001
+From: "beiling.xie" <xiekunxun@huawei.com>
+Date: Wed, 21 Sep 2022 11:57:27 +0800
+Subject: [PATCH] Adaptation for dsoftbus
+
+Signed-off-by: beiling.xie <xiekunxun@huawei.com>
+---
+ base/BUILD.gn       | 37 ++++---------------------------------
+ base/src/parcel.cpp |  1 +
+ 2 files changed, 5 insertions(+), 33 deletions(-)
+
+diff --git a/base/BUILD.gn b/base/BUILD.gn
+index 883b1ec..723627b 100644
+--- a/base/BUILD.gn
++++ b/base/BUILD.gn
+@@ -38,24 +38,8 @@ config("static_utils_config") {
+ }
+ 
+ sources_utils = [
+-  "src/string_ex.cpp",
+-  "src/unicode_ex.cpp",
+-  "src/directory_ex.cpp",
+-  "src/datetime_ex.cpp",
+   "src/refbase.cpp",
+   "src/parcel.cpp",
+-  "src/semaphore_ex.cpp",
+-  "src/thread_pool.cpp",
+-  "src/file_ex.cpp",
+-  "src/observer.cpp",
+-  "src/thread_ex.cpp",
+-  "src/event_demultiplexer.cpp",
+-  "src/event_handler.cpp",
+-  "src/event_reactor.cpp",
+-  "src/timer.cpp",
+-  "src/timer_event_handler.cpp",
+-  "src/ashmem.cpp",
+-  "src/rwlock.cpp",
+ ]
+ 
+ securec_sources = [
+@@ -110,21 +94,18 @@ ohos_static_library("utilsbase") {
+   ]
+   public_configs = [ ":static_utils_config" ]
+   defines = [ "CONFIG_HILOG" ]
+-  external_deps = [ "hilog_native:libhilog_base" ]
+ }
+ 
+ ohos_shared_library("utils") {
+   sources = sources_utils
+-  sources += securec_sources
+   configs = [
+     ":utils_config",
+     ":private_securec_config",
+   ]
+   public_configs = [ ":static_utils_config" ]
+-  subsystem_name = "utils"
+   defines = [ "CONFIG_HILOG" ]
+-  external_deps = [ "hilog_native:libhilog_base" ]
+-  part_name = "utils_base"
++  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
++  deps += [ "//depend:libhilog" ]
+   install_images = [
+     "system",
+     "updater",
+@@ -159,17 +140,7 @@ ohos_static_library("utilsecurec_ace_allplatforms") {
+   public_configs = [ ":static_utils_config" ]
+ }
+ 
+-ohos_shared_library("utilsecurec_shared") {
+-  sources = securec_sources
+-  configs = [
+-    ":utils_config",
+-    ":private_securec_config",
+-  ]
+-  public_configs = [ ":utils_config" ]
+-  part_name = "utils_base"
+-  install_images = [
+-    "system",
+-    "updater",
+-  ]
++group("utilsecurec_shared") {
+ }
++
+ ###############################################################################
+diff --git a/base/src/parcel.cpp b/base/src/parcel.cpp
+index 855f7cf..1abaec5 100755
+--- a/base/src/parcel.cpp
++++ b/base/src/parcel.cpp
+@@ -13,6 +13,7 @@
+  * limitations under the License.
+  */
+ 
++#include <climits>
+ #include "parcel.h"
+ #include "securec.h"
+ #include "utils_log.h"
+-- 
+2.25.1
+