1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
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
|
