automatic import of dsoftbusopeneuler20.03

1 files changed, 89 insertions, 0 deletions

diff --git a/dsoftbus-standard-0001-simplify-dependency-for-dsoftbus-standard.patch b/dsoftbus-standard-0001-simplify-dependency-for-dsoftbus-standard.patch
new file mode 100644
index 0000000..1099f1d
--- /dev/null
+++ b/dsoftbus-standard-0001-simplify-dependency-for-dsoftbus-standard.patch
@@ -0,0 +1,89 @@
+From 26d71c4574464eb92b506ba7be48a2980500bee7 Mon Sep 17 00:00:00 2001
+From: "beiling.xie" <xiekunxun@huawei.com>
+Date: Thu, 10 Nov 2022 10:26:14 +0800
+Subject: [PATCH] simplify dependency on third-party packages
+
+Signed-off-by: beiling.xie <xiekunxun@huawei.com>
+---
+ adapter/BUILD.gn     |  2 +-
+ core/common/BUILD.gn |  2 +-
+ core/frame/BUILD.gn  | 13 ++++++-------
+ sdk/BUILD.gn         |  6 +++---
+ 4 files changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/adapter/BUILD.gn b/adapter/BUILD.gn
+index fe6cb79b..e59c2965 100644
+--- a/adapter/BUILD.gn
++++ b/adapter/BUILD.gn
+@@ -137,7 +137,7 @@ if (defined(ohos_lite)) {
+     ]
+     public_configs = [ ":config_adapter_common" ]
+     if (is_standard_system) {
+-      external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
++      deps += [ "//depend:libhilog" ]
+     }
+     part_name = "dsoftbus_standard"
+     subsystem_name = "communication"
+diff --git a/core/common/BUILD.gn b/core/common/BUILD.gn
+index fdb4134d..4c305d7f 100644
+--- a/core/common/BUILD.gn
++++ b/core/common/BUILD.gn
+@@ -114,7 +114,7 @@ if (defined(ohos_lite)) {
+       "//utils/native/base:utilsecurec_shared",
+     ]
+     if (is_standard_system) {
+-      external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
++      deps = [ "//depend:libhilog" ]
+     }
+     part_name = "dsoftbus_standard"
+     subsystem_name = "communication"
+diff --git a/core/frame/BUILD.gn b/core/frame/BUILD.gn
+index 5109f201..3948ef68 100644
+--- a/core/frame/BUILD.gn
++++ b/core/frame/BUILD.gn
+@@ -163,10 +163,9 @@ if (defined(ohos_lite)) {
+       "//base/security/deviceauth/services:deviceauth",
+     ]
+     if (is_standard_system) {
+-      external_deps = bus_center_server_external_deps
+-      external_deps += [
+-        "hiviewdfx_hilog_native:libhilog",
+-        "ipc:ipc_core",
++      deps += [
++        "//depend:libhilog",
++        "//depend/ipc:ipc_core",
+       ]
+     }
+ 
+@@ -192,9 +191,9 @@ if (defined(ohos_lite)) {
+       "//base/security/huks/services/huks_standard/huks_engine/main/core:huks_engine_core_standard",
+       "//depend:syspara",
+     ]
+-    external_deps = [
+-      "hiviewdfx_hilog_native:libhilog",
+-      "ipc:ipc_core",
++    deps += [
++      "//depend:libhilog",
++      "//depend/ipc:ipc_core",
+     ]
+     part_name = "dsoftbus_standard"
+     subsystem_name = "communication"
+diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
+index f322ce5c..73771588 100644
+--- a/sdk/BUILD.gn
++++ b/sdk/BUILD.gn
+@@ -85,9 +85,9 @@ target(build_type, "softbus_client") {
+     cflags = [ "-fPIC" ]
+     cflags_cc = [ "-std=c++14" ]
+     if (is_standard_system) {
+-      external_deps = [
+-        "hiviewdfx_hilog_native:libhilog",
+-        "ipc:ipc_single",
++      deps += [
++        "//depend:libhilog",
++        "//depend/ipc:ipc_single",
+       ]
+     }
+     part_name = "dsoftbus_standard"
+-- 
+Gitee