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
|
From 382ff16702df5f06b96a76abd2b542ab00650487 Mon Sep 17 00:00:00 2001
From: "beiling.xie" <xiekunxun@huawei.com>
Date: Thu, 10 Nov 2022 14:34:05 +0800
Subject: [PATCH] simplify dependency on third-party packages
Signed-off-by: beiling.xie <xiekunxun@huawei.com>
---
deps_adapter/BUILD.gn | 4 ++--
services/BUILD.gn | 23 +++++++++--------------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/deps_adapter/BUILD.gn b/deps_adapter/BUILD.gn
index 906b8ca..722d974 100644
--- a/deps_adapter/BUILD.gn
+++ b/deps_adapter/BUILD.gn
@@ -120,10 +120,10 @@ if (defined(ohos_lite)) {
"//base/security/huks/interfaces/innerkits/huks_standard/main:libhukssdk",
"//depend:syspara",
"//third_party/cJSON:cjson_static",
- "//third_party/openssl:libcrypto_static",
"//utils/native/base:utils",
"//third_party/bounds_checking_function:libsec_shared",
]
- external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+ deps += [ "//depend:libhilog" ]
+ libs = [ "crypto" ]
}
}
diff --git a/services/BUILD.gn b/services/BUILD.gn
index ce6e24b..0c37820 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -167,9 +167,9 @@ if (defined(ohos_lite)) {
"//foundation/communication/dsoftbus/sdk:softbus_client"
]
- external_deps = [
- "hiviewdfx_hilog_native:libhilog",
- "ipc:ipc_core",
+ deps += [
+ "//depend:libhilog",
+ "//depend/ipc:ipc_core",
]
if (support_jsapi) {
external_deps += [ "os_account_standard:os_account_innerkits" ]
@@ -217,12 +217,9 @@ if (defined(ohos_lite)) {
"//utils/native/base:utils",
]
- external_deps = [
- "access_token:libaccesstoken_sdk",
- "hiviewdfx_hilog_native:libhilog",
- "ipc:ipc_core",
- "safwk:system_ability_fwk",
- "samgr_standard:samgr_proxy",
+ deps += [
+ "//depend:libhilog",
+ "//depend/ipc:ipc_core",
]
}
@@ -268,11 +265,9 @@ if (defined(ohos_lite)) {
"//third_party/cJSON:cjson_static",
]
- external_deps = [
- "access_token:libaccesstoken_sdk",
- "hiviewdfx_hilog_native:libhilog",
- "ipc:ipc_core",
- "samgr_standard:samgr_proxy",
+ deps += [
+ "//depend:libhilog",
+ "//depend/ipc:ipc_core",
]
}
}
--
2.25.1
|
