From fe17d4e4cf0395de7eb8bb014d2a487085061a47 Mon Sep 17 00:00:00 2001
From: l00635678
Date: Fri, 30 May 2025 14:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=8B=AC=E7=AB=8B=E5=8C=96?=
=?UTF-8?q?=E7=BC=96=E8=AF=91=E5=8F=8A=E5=86=85=E5=AD=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: l00635678
---
frameworks/js/napi/ethernet/BUILD.gn | 1 -
frameworks/js/napi/extensionability/BUILD.gn | 2 +-
frameworks/js/napi/extensioncontext/BUILD.gn | 2 +-
frameworks/js/napi/vpn/BUILD.gn | 1 +
frameworks/js/napi/vpnext/BUILD.gn | 4 +-
interfaces/innerkits/ethernetclient/BUILD.gn | 19 ++-----
interfaces/innerkits/mdnsclient/BUILD.gn | 16 ++----
.../innerkits/netfirewallclient/BUILD.gn | 16 ++----
interfaces/innerkits/netshareclient/BUILD.gn | 18 ++-----
interfaces/innerkits/netvpnclient/BUILD.gn | 17 ++-----
.../innerkits/networksliceclient/BUILD.gn | 12 ++---
interfaces/innerkits/vpnextension/BUILD.gn | 12 +----
.../wearabledistributednetclient/BUILD.gn | 12 +----
netmanager_ext_config.gni | 51 ++++---------------
services/ethernetmanager/BUILD.gn | 15 +-----
services/mdnsmanager/BUILD.gn | 23 ++-------
services/netfirewallmanager/BUILD.gn | 17 +------
services/networksharemanager/BUILD.gn | 33 +++---------
services/networkslicemanager/BUILD.gn | 14 +----
services/vpnmanager/BUILD.gn | 18 ++-----
.../wearabledistributednetmanager/BUILD.gn | 21 ++------
.../fuzztest/ethernetclient_fuzzer/BUILD.gn | 5 +-
.../unittest/ethernet_manager_test/BUILD.gn | 7 +--
.../netfirewallclient_fuzzer/BUILD.gn | 10 ++--
.../unittest/netfirewallmanager_test/BUILD.gn | 8 ++-
.../fuzztest/netshareclient_fuzzer/BUILD.gn | 3 +-
.../networkshare_manager_test/BUILD.gn | 1 -
.../unittest/sys_vpn_manager_test/BUILD.gn | 1 +
.../unittest/vpn_manager_ext_test/BUILD.gn | 3 +-
.../unittest/vpn_manager_test/BUILD.gn | 2 +-
.../BUILD.gn | 9 +---
utils/BUILD.gn | 29 ++---------
32 files changed, 83 insertions(+), 319 deletions(-)
diff --git a/frameworks/js/napi/ethernet/BUILD.gn b/frameworks/js/napi/ethernet/BUILD.gn
index 38533415..fd066071 100644
--- a/frameworks/js/napi/ethernet/BUILD.gn
+++ b/frameworks/js/napi/ethernet/BUILD.gn
@@ -26,7 +26,6 @@ ohos_shared_library("ethernet") {
include_dirs = [
"context",
"$NETMANAGER_EXT_ROOT/utils/log/include",
- "$NETCONNMANAGER_UTILS_DIR/common_utils/include",
]
sources = [
diff --git a/frameworks/js/napi/extensionability/BUILD.gn b/frameworks/js/napi/extensionability/BUILD.gn
index 583926d9..a8cd77d0 100644
--- a/frameworks/js/napi/extensionability/BUILD.gn
+++ b/frameworks/js/napi/extensionability/BUILD.gn
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
import("//build/ohos.gni")
es2abc_gen_abc("gen_vpn_extension_ability_abc") {
diff --git a/frameworks/js/napi/extensioncontext/BUILD.gn b/frameworks/js/napi/extensioncontext/BUILD.gn
index 86116433..d8050bfe 100644
--- a/frameworks/js/napi/extensioncontext/BUILD.gn
+++ b/frameworks/js/napi/extensioncontext/BUILD.gn
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
import("//build/ohos.gni")
es2abc_gen_abc("gen_vpn_extension_context_abc") {
diff --git a/frameworks/js/napi/vpn/BUILD.gn b/frameworks/js/napi/vpn/BUILD.gn
index 34369641..e5146a9b 100644
--- a/frameworks/js/napi/vpn/BUILD.gn
+++ b/frameworks/js/napi/vpn/BUILD.gn
@@ -78,6 +78,7 @@ ohos_shared_library("vpn") {
"ipc:ipc_core",
"napi:ace_napi",
"netmanager_base:napi_utils",
+ "netmanager_base:net_conn_manager_if",
"netmanager_base:net_manager_common",
]
diff --git a/frameworks/js/napi/vpnext/BUILD.gn b/frameworks/js/napi/vpnext/BUILD.gn
index 0e7c744e..5bb1534c 100644
--- a/frameworks/js/napi/vpnext/BUILD.gn
+++ b/frameworks/js/napi/vpnext/BUILD.gn
@@ -43,13 +43,10 @@ ohos_shared_library("vpnextension") {
]
}
- configs = [ "$ABILITY_RUNTIME_SERVICES_PATH/abilitymgr:abilityms_config" ]
include_dirs = [
"$NETMANAGER_EXT_NAPI_ROOT/vpnext/include",
"$NETMANAGER_EXT_NAPI_ROOT/vpnext/include/context",
- "$ABILITY_RUNTIME_NAPI_PATH/inner/napi_common",
"$NETMANAGER_EXT_ROOT/interfaces/innerkits/vpnextension/include",
- "$ABILITY_RUNTIME_KITS_PATH/native/appkit/ability_runtime/context",
]
deps = [
@@ -71,6 +68,7 @@ ohos_shared_library("vpnextension") {
"ipc:ipc_core",
"napi:ace_napi",
"netmanager_base:napi_utils",
+ "netmanager_base:net_conn_manager_if",
"netmanager_base:net_data_share",
"netmanager_base:net_manager_common",
"samgr:samgr_proxy",
diff --git a/interfaces/innerkits/ethernetclient/BUILD.gn b/interfaces/innerkits/ethernetclient/BUILD.gn
index e25a5935..5461fd67 100644
--- a/interfaces/innerkits/ethernetclient/BUILD.gn
+++ b/interfaces/innerkits/ethernetclient/BUILD.gn
@@ -38,20 +38,12 @@ config("net_conn_manager_if_config") {
cflags += [ "-DBUILD_PUBLIC_VERSION" ]
}
- cflags += [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags += common_cflags
- cflags_cc = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags
}
-ohos_source_set("ethernet_parcel") {
+ohos_static_library("ethernet_parcel") {
sanitize = {
cfi = true
cfi_cross_dso = true
@@ -65,8 +57,6 @@ ohos_source_set("ethernet_parcel") {
"$ETHERNETMANAGER_INNERKITS_SOURCE_DIR/src/interface_configuration.cpp",
"$ETHERNETMANAGER_INNERKITS_SOURCE_DIR/src/mac_address_info.cpp",
"$ETHERNETMANAGER_INNERKITS_SOURCE_DIR/src/static_configuration.cpp",
- "$NETCONNMANAGER_INNERKITS_SOURCE_DIR/src/http_proxy.cpp",
- "$NETCONNMANAGER_INNERKITS_SOURCE_DIR/src/inet_addr.cpp",
"$ETHERNETMANAGER_INNERKITS_SOURCE_DIR/src/ethernet_device_info.cpp",
]
@@ -78,6 +68,7 @@ ohos_source_set("ethernet_parcel") {
external_deps = [
"c_utils:utils",
+ "netmanager_base:net_conn_manager_if",
"netmanager_base:net_manager_common",
"netmanager_base:net_native_manager_if",
]
@@ -101,7 +92,7 @@ config("ethernet_service_interface_stub_config") {
]
}
-ohos_source_set("ethernet_service_interface_stub") {
+ohos_static_library("ethernet_service_interface_stub") {
sanitize = {
cfi = true
cfi_cross_dso = true
diff --git a/interfaces/innerkits/mdnsclient/BUILD.gn b/interfaces/innerkits/mdnsclient/BUILD.gn
index fabb88c8..683b0194 100644
--- a/interfaces/innerkits/mdnsclient/BUILD.gn
+++ b/interfaces/innerkits/mdnsclient/BUILD.gn
@@ -37,20 +37,12 @@ config("net_mdns_manager_if_config") {
cflags += [ "-DBUILD_PUBLIC_VERSION" ]
}
- cflags += [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags += common_cflags
- cflags_cc = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags
}
-ohos_source_set("mdns_parcel") {
+ohos_static_library("mdns_parcel") {
sanitize = {
cfi = true
cfi_cross_dso = true
@@ -95,7 +87,7 @@ config("mdns_service_interface_stub_config") {
]
}
-ohos_source_set("mdns_service_interface_stub") {
+ohos_static_library("mdns_service_interface_stub") {
sanitize = {
cfi = true
cfi_cross_dso = true
diff --git a/interfaces/innerkits/netfirewallclient/BUILD.gn b/interfaces/innerkits/netfirewallclient/BUILD.gn
index d9e72464..a98f015f 100755
--- a/interfaces/innerkits/netfirewallclient/BUILD.gn
+++ b/interfaces/innerkits/netfirewallclient/BUILD.gn
@@ -36,20 +36,12 @@ config("net_conn_manager_if_config") {
defines += [ "BUILD_PUBLIC_VERSION" ]
}
- cflags = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags
- cflags_cc = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags
}
-ohos_source_set("netfirewall_parcel") {
+ohos_static_library("netfirewall_parcel") {
sanitize = {
cfi = true
cfi_cross_dso = true
@@ -67,7 +59,7 @@ ohos_source_set("netfirewall_parcel") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
- "netmanager_base:net_conn_parcel",
+ "netmanager_base:net_conn_manager_if",
"netmanager_base:net_native_manager_if",
]
diff --git a/interfaces/innerkits/netshareclient/BUILD.gn b/interfaces/innerkits/netshareclient/BUILD.gn
index 2f74dc5d..4769650a 100644
--- a/interfaces/innerkits/netshareclient/BUILD.gn
+++ b/interfaces/innerkits/netshareclient/BUILD.gn
@@ -38,20 +38,12 @@ config("net_conn_manager_if_config") {
cflags += [ "-DBUILD_PUBLIC_VERSION" ]
}
- cflags += [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags += common_cflags
- cflags_cc = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags
}
-ohos_source_set("networkshare_parcel") {
+ohos_static_library("networkshare_parcel") {
sanitize = {
cfi = true
cfi_cross_dso = true
@@ -70,7 +62,7 @@ ohos_source_set("networkshare_parcel") {
external_deps = [
"bounds_checking_function:libsec_shared",
- "netmanager_base:net_conn_parcel",
+ "netmanager_base:net_conn_manager_if",
"netmanager_base:net_manager_common",
]
@@ -94,7 +86,7 @@ config("netshare_service_interface_stub_config") {
]
}
-ohos_source_set("netshare_service_interface_stub") {
+ohos_static_library("netshare_service_interface_stub") {
sanitize = {
cfi = true
cfi_cross_dso = true
diff --git a/interfaces/innerkits/netvpnclient/BUILD.gn b/interfaces/innerkits/netvpnclient/BUILD.gn
index f792c028..b91871fc 100644
--- a/interfaces/innerkits/netvpnclient/BUILD.gn
+++ b/interfaces/innerkits/netvpnclient/BUILD.gn
@@ -20,7 +20,6 @@ config("net_conn_manager_if_config") {
"include",
"include/ipc",
"${target_gen_dir}",
- "$NETMANAGERNATIVE_ROOT/fwmarkclient/include",
"$EXT_INNERKITS_ROOT/include",
"$NETMANAGER_EXT_ROOT/utils/log/include",
]
@@ -39,17 +38,9 @@ config("net_conn_manager_if_config") {
defines += [ "BUILD_PUBLIC_VERSION" ]
}
- cflags = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags
- cflags_cc = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags
if (netmanager_ext_feature_sysvpn) {
cflags += sysvpn_flags
@@ -58,7 +49,7 @@ config("net_conn_manager_if_config") {
}
}
-ohos_source_set("networkvpn_parcel") {
+ohos_static_library("networkvpn_parcel") {
sanitize = {
cfi = true
cfi_cross_dso = true
@@ -88,7 +79,7 @@ ohos_source_set("networkvpn_parcel") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
- "netmanager_base:net_conn_parcel",
+ "netmanager_base:net_conn_manager_if",
"netmanager_base:net_manager_common",
]
diff --git a/interfaces/innerkits/networksliceclient/BUILD.gn b/interfaces/innerkits/networksliceclient/BUILD.gn
index 44535be1..469c9150 100644
--- a/interfaces/innerkits/networksliceclient/BUILD.gn
+++ b/interfaces/innerkits/networksliceclient/BUILD.gn
@@ -36,18 +36,12 @@ config("net_conn_manager_if_config") {
defines += [ "BUILD_PUBLIC_VERSION" ]
}
- cflags = [
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags
- cflags_cc = [
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags
}
-ohos_source_set("networkslice_parcel") {
+ohos_static_library("networkslice_parcel") {
sanitize = {
cfi = true
cfi_cross_dso = true
diff --git a/interfaces/innerkits/vpnextension/BUILD.gn b/interfaces/innerkits/vpnextension/BUILD.gn
index cea82aa3..235e8a4c 100644
--- a/interfaces/innerkits/vpnextension/BUILD.gn
+++ b/interfaces/innerkits/vpnextension/BUILD.gn
@@ -19,16 +19,8 @@ config("net_vpn_extension_if_config") {
include_dirs = [
"include",
"include/ipc",
- "$NETMANAGERNATIVE_ROOT/fwmarkclient/include",
"$EXT_INNERKITS_ROOT/include",
"$NETMANAGER_EXT_ROOT/utils/log/include",
- "$ABILITY_RUNTIME_SERVICES_PATH/common/include",
- "$ABILITY_RUNTIME_NAPI_PATH/inner/napi_common",
- "$ABILITY_RUNTIME_INNER_API_PATH/dataobs_manager/include",
- "$ABILITY_RUNTIME_INNER_API_PATH/runtime/include",
- "$ABILITY_RUNTIME_KITS_PATH/native/appkit/ability_runtime",
- "$ABILITY_RUNTIME_KITS_PATH/native/ability/ability_runtime",
- "$ABILITY_RUNTIME_KITS_PATH/native/ability/native",
]
defines = []
@@ -56,7 +48,6 @@ ohos_shared_library("vpn_extension") {
branch_protector_ret = "pac_ret"
sources = [
- "$ABILITY_RUNTIME_PATH/frameworks/native/ability/native/ability_business_error/ability_business_error.cpp",
"$VPN_EXTENSION_SOURCE_DIR/src/js_vpn_extension.cpp",
"$VPN_EXTENSION_SOURCE_DIR/src/js_vpn_extension_context.cpp",
"$VPN_EXTENSION_SOURCE_DIR/src/vpn_extension.cpp",
@@ -68,7 +59,6 @@ ohos_shared_library("vpn_extension") {
include_dirs = [
"$EXT_INNERKITS_ROOT/include",
"$NETMANAGER_EXT_ROOT/utils/log/include",
- "${ABILITY_RUNTIME_PATH}/interfaces/kits/native/ability/native",
]
deps = [
@@ -101,7 +91,7 @@ ohos_shared_library("vpn_extension") {
"napi:ace_napi",
"netmanager_base:fwmark_client",
"netmanager_base:napi_utils",
- "netmanager_base:net_conn_parcel",
+ "netmanager_base:net_conn_manager_if",
"netmanager_base:net_manager_common",
"netmanager_base:net_native_manager_if",
"safwk:system_ability_fwk",
diff --git a/interfaces/innerkits/wearabledistributednetclient/BUILD.gn b/interfaces/innerkits/wearabledistributednetclient/BUILD.gn
index 07045ae6..768e9dda 100644
--- a/interfaces/innerkits/wearabledistributednetclient/BUILD.gn
+++ b/interfaces/innerkits/wearabledistributednetclient/BUILD.gn
@@ -38,17 +38,9 @@ config("net_conn_manager_if_config") {
cflags += [ "-DBUILD_PUBLIC_VERSION" ]
}
- cflags += [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags += common_cflags
- cflags_cc = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags
defines = [
"NETMGR_LOG_TAG = \"WearableDistributedNetManager\"",
"LOG_DOMAIN = 0xD0015B0",
diff --git a/netmanager_ext_config.gni b/netmanager_ext_config.gni
index a8e45ad6..d23e0dca 100644
--- a/netmanager_ext_config.gni
+++ b/netmanager_ext_config.gni
@@ -53,47 +53,8 @@ NETWORKSLICE_SOURCE_DIR = "$NETMANAGER_EXT_ROOT/services/networkslicemanager"
# args of uitls
NETWORKSHAREMANAGER_UTILS_DIR = "$NETMANAGER_EXT_ROOT/utils"
-# args of base module
-NETMANAGER_BASE_ROOT = "$SUBSYSTEM_DIR/netmanager_base"
-
-# args of base modules'frameworks
-NETCONNMANAGER_INNERKITS_SOURCE_DIR =
- "$NETMANAGER_BASE_ROOT/frameworks/native/netconnclient"
-
-# args of base modules' interfaces
-BASE_INNERKITS_ROOT = "$NETMANAGER_BASE_ROOT/interfaces/innerkits"
-
-# args of base module's servicesability_runtime
-NETCONNMANAGER_COMMON_DIR = "$NETMANAGER_BASE_ROOT/services/common"
-NETSYSCONTROLLER_ROOT_DIR = "$NETMANAGER_BASE_ROOT/services/netsyscontroller"
-NETCONNMANAGER_SOURCE_DIR = "$NETMANAGER_BASE_ROOT/services/netconnmanager"
-NETMANAGERNATIVE_ROOT = "$NETMANAGER_BASE_ROOT/services/netmanagernative"
-
-# args of base module's utils
-NETCONNMANAGER_UTILS_DIR = "$NETMANAGER_BASE_ROOT/utils"
-
-# NETMANAGER_PREBUILTS_DIR = "$NETMANAGER_BASE_ROOT/prebuilts"
-
# args of other module
-DHCP_MANAGER_ROOT = "//foundation/communication/dhcp"
WIFI_MANAGER_ROOT = "//foundation/communication/wifi/wifi"
-WIFI_MANAGER_INNERKITS_DIR = "$WIFI_MANAGER_ROOT/interfaces/kits/c"
-WIFI_FRAMEWORK_NATIVE_INCLUDE = "$WIFI_MANAGER_ROOT/frameworks/native/include"
-BLUETOOTH_ROOT = "//foundation/communication/bluetooth"
-USB_MANAGER_ROOT = "//base/usb/usb_manager"
-SAMGR_MANAGER_ROOT = "//foundation/systemabilitymgr/samgr"
-UTILS_ROOT = "//utils"
-THIRD_PARTY_ROOT = "//third_party"
-C_UTILS_ROOT = "//commonlibrary/c_utils"
-ABILITY_RUNTIME_PATH = "//foundation/ability/ability_runtime"
-ABILITY_RUNTIME_INNER_API_PATH = "$ABILITY_RUNTIME_PATH/interfaces/inner_api"
-ABILITY_RUNTIME_KITS_PATH = "$ABILITY_RUNTIME_PATH/interfaces/kits"
-ABILITY_RUNTIME_SERVICES_PATH = "$ABILITY_RUNTIME_PATH/services"
-ABILITY_RUNTIME_NAPI_PATH = "$ABILITY_RUNTIME_PATH/frameworks/js/napi"
-ABILITY_RUNTIME_NATIVE_PATH = "$ABILITY_RUNTIME_PATH/frameworks/native"
-ABILITY_DISPLAY_MANAGER = "//foundation/window/window_manager"
-BATTERY_MANAER_PATH = "//base/powermgr/battery_manager"
-BATTERY_INNER_API = "$BATTERY_MANAER_PATH/interfaces/inner_api"
use_js_debug = false
declare_args() {
@@ -119,16 +80,22 @@ declare_args() {
sysvpn_flags = [ "-DSUPPORT_SYSVPN" ]
-memory_optimization_cflags = [
- "-fvisibility=hidden",
+common_cflags = [
+ "-fstack-protector-strong",
+ "-D_FORTIFY_SOURCE=2",
"-fdata-sections",
"-ffunction-sections",
"-Os",
+ "-O2",
+]
+
+memory_optimization_cflags = [
+ "-fvisibility=hidden",
]
memory_optimization_cflags_cc = [
+ "-fvisibility=hidden",
"-fvisibility-inlines-hidden",
- "-Os",
]
memory_optimization_ldflags = [
diff --git a/services/ethernetmanager/BUILD.gn b/services/ethernetmanager/BUILD.gn
index a360e4bf..2f60e0a7 100644
--- a/services/ethernetmanager/BUILD.gn
+++ b/services/ethernetmanager/BUILD.gn
@@ -36,28 +36,17 @@ ohos_shared_library("ethernet_manager") {
]
include_dirs = [
- "$NETCONNMANAGER_UTILS_DIR/common_utils/include",
- "$NETCONNMANAGER_COMMON_DIR/include",
"include",
"include/stub",
"$EXT_INNERKITS_ROOT/include",
"$EXT_INNERKITS_ROOT/ethernetclient/include",
"$EXT_INNERKITS_ROOT/ethernetclient/include/proxy",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
"$NETMANAGER_EXT_ROOT/utils/log/include",
]
- cflags = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags
- cflags_cc = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags
deps = [ "$EXT_INNERKITS_ROOT/ethernetclient:ethernet_parcel" ]
deps += [ "$EXT_INNERKITS_ROOT/ethernetclient:ethernet_service_interface_stub" ]
diff --git a/services/mdnsmanager/BUILD.gn b/services/mdnsmanager/BUILD.gn
index 5d1e0690..5dc71aea 100644
--- a/services/mdnsmanager/BUILD.gn
+++ b/services/mdnsmanager/BUILD.gn
@@ -52,28 +52,11 @@ ohos_shared_library("mdns_manager") {
]
deps += [ "$EXT_INNERKITS_ROOT/mdnsclient:mdns_service_interface_stub" ]
- cflags = [
- "-fvisibility=hidden",
- "-fdata-sections",
- "-ffunction-sections",
- "-Os",
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags + memory_optimization_cflags
- cflags_cc = [
- "-fvisibility-inlines-hidden",
- "-Os",
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags + memory_optimization_cflags_cc
- ldflags = [
- "-Wl,--exclude-libs=ALL",
- "-Wl,--gc-sections",
- ]
+ ldflags = memory_optimization_ldflags
external_deps = [
"bounds_checking_function:libsec_shared",
diff --git a/services/netfirewallmanager/BUILD.gn b/services/netfirewallmanager/BUILD.gn
index d8b82866..07c2c83b 100755
--- a/services/netfirewallmanager/BUILD.gn
+++ b/services/netfirewallmanager/BUILD.gn
@@ -18,12 +18,9 @@ config("netfirewall_manager_config") {
include_dirs = [
"$EXT_INNERKITS_ROOT/include",
"$EXT_INNERKITS_ROOT/netfirewallclient/include",
- "$NETCONNMANAGER_COMMON_DIR/include",
"$NETMANAGER_EXT_ROOT/utils/log/include",
"$NETFIREWALLMANAGER_SOURCE_DIR/include",
"$NETWORKSHAREMANAGER_UTILS_DIR/event_report/include",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
- "$NETCONNMANAGER_UTILS_DIR/common_utils/include",
]
defines = [
@@ -94,19 +91,9 @@ ohos_shared_library("netfirewall_manager") {
deps = netfirewall_manager_deps
external_deps = netfirewall_manager_external_deps
- cflags = memory_optimization_cflags
- cflags += [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags + memory_optimization_cflags
- cflags_cc = memory_optimization_cflags_cc
- cflags_cc += [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags + memory_optimization_cflags_cc
deps += [ "$EXT_INNERKITS_ROOT/netfirewallclient:netfirewall_parcel" ]
diff --git a/services/networksharemanager/BUILD.gn b/services/networksharemanager/BUILD.gn
index cec11eca..33dcd4dd 100644
--- a/services/networksharemanager/BUILD.gn
+++ b/services/networksharemanager/BUILD.gn
@@ -20,13 +20,11 @@ config("net_tether_manager_config") {
"$EXT_INNERKITS_ROOT/netshareclient/include",
"$EXT_INNERKITS_ROOT/netshareclient/include/proxy",
"$EXT_INNERKITS_ROOT/netshareclient/include/proxy/ipccallback",
- "$NETCONNMANAGER_COMMON_DIR/include",
"$NETMANAGER_EXT_ROOT/utils/log/include",
"$NETWORKSHAREMANAGER_SOURCE_DIR/include",
"$NETWORKSHAREMANAGER_SOURCE_DIR/include/stub",
"$NETWORKSHAREMANAGER_SOURCE_DIR/include/utils",
"$NETWORKSHAREMANAGER_UTILS_DIR/event_report/include",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
]
if (communication_wifi_switch_enable) {
include_dirs += [ "$WIFI_MANAGER_ROOT/interfaces/kits/c" ]
@@ -65,28 +63,11 @@ ohos_shared_library("net_tether_manager") {
deps = [ "$NETMANAGER_EXT_ROOT/utils:net_event_report" ]
deps += [ "$EXT_INNERKITS_ROOT/netshareclient:netshare_service_interface_stub" ]
- cflags = [
- "-fvisibility=hidden",
- "-fdata-sections",
- "-ffunction-sections",
- "-Os",
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags + memory_optimization_cflags
- cflags_cc = [
- "-fvisibility-inlines-hidden",
- "-Os",
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags + memory_optimization_cflags_cc
- ldflags = [
- "-Wl,--exclude-libs=ALL",
- "-Wl,--gc-sections",
- ]
+ ldflags = memory_optimization_ldflags
external_deps = [
"ability_base:want",
@@ -109,9 +90,8 @@ ohos_shared_library("net_tether_manager") {
"netmanager_base:net_manager_common",
"netmanager_base:net_native_manager_if",
"netmanager_base:net_stats_manager_if",
+ "netmanager_base:net_service_common",
"netmanager_base:netsys_controller",
- "openssl:libcrypto_shared",
- "openssl:libssl_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"time_service:time_client",
@@ -207,7 +187,6 @@ ohos_static_library("net_tether_manager_static") {
deps = [
"$NETMANAGER_EXT_ROOT/utils:net_event_report",
- "$NETSYSCONTROLLER_ROOT_DIR:netsys_controller",
]
deps += [ "$EXT_INNERKITS_ROOT/netshareclient:netshare_service_interface_stub" ]
@@ -227,13 +206,13 @@ ohos_static_library("net_tether_manager_static") {
"init:libbeget_proxy",
"init:libbegetutil",
"ipc:ipc_core",
+ "netmanager_base:netsys_controller",
"netmanager_base:net_conn_manager_if",
"netmanager_base:net_data_share",
"netmanager_base:net_manager_common",
"netmanager_base:net_native_manager_if",
+ "netmanager_base:net_service_common",
"netmanager_base:net_stats_manager_if",
- "openssl:libcrypto_shared",
- "openssl:libssl_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"time_service:time_client",
diff --git a/services/networkslicemanager/BUILD.gn b/services/networkslicemanager/BUILD.gn
index 5ab3580a..d33ce428 100644
--- a/services/networkslicemanager/BUILD.gn
+++ b/services/networkslicemanager/BUILD.gn
@@ -22,7 +22,6 @@ ohos_shared_library("networkslice_manager") {
}
branch_protector_ret = "pac_ret"
sources = [
- "$NETCONNMANAGER_INNERKITS_SOURCE_DIR/src/inet_addr.cpp",
"src/allowednssaiconfig.cpp",
"src/broadcast_proxy.cpp",
"src/dns_result_callback.cpp",
@@ -73,18 +72,9 @@ ohos_shared_library("networkslice_manager") {
"samgr:samgr_proxy",
]
- cflags = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags
- cflags_cc = [
- "-fstack-protector-strong",
- "-fexceptions",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags
deps = [
"$NETMANAGER_EXT_ROOT/interfaces/innerkits/netvpnclient:net_vpn_manager_if",
diff --git a/services/vpnmanager/BUILD.gn b/services/vpnmanager/BUILD.gn
index b67cbd6c..57238f70 100644
--- a/services/vpnmanager/BUILD.gn
+++ b/services/vpnmanager/BUILD.gn
@@ -19,13 +19,10 @@ config("net_vpn_manager_config") {
"$EXT_INNERKITS_ROOT/include",
"$EXT_INNERKITS_ROOT/netvpnclient/include",
"$EXT_INNERKITS_ROOT/netvpnclient/include/ipc",
- "$NETCONNMANAGER_COMMON_DIR/include",
"$NETMANAGER_EXT_ROOT/utils/log/include",
"$VPNMANAGER_SOURCE_DIR/include",
"$VPNMANAGER_SOURCE_DIR/include/ipc",
"$NETWORKSHAREMANAGER_UTILS_DIR/event_report/include",
- "$NETMANAGERNATIVE_ROOT/include/netsys",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
"$NETMANAGER_EXT_ROOT/frameworks/js/napi/vpnext/include",
]
@@ -82,6 +79,7 @@ net_vpn_manager_external_deps = [
"netmanager_base:net_data_share",
"netmanager_base:net_manager_common",
"netmanager_base:net_native_manager_if",
+ "netmanager_base:net_service_common",
"netmanager_base:netsys_controller",
"os_account:os_account_innerkits",
"relational_store:native_rdb",
@@ -111,22 +109,12 @@ ohos_shared_library("net_vpn_manager") {
deps += [ "$EXT_INNERKITS_ROOT/netvpnclient:networkvpn_interface_stub" ]
external_deps = net_vpn_manager_external_deps
- cflags = memory_optimization_cflags
- cflags += [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags + memory_optimization_cflags
defines = []
if (netmanager_ext_feature_vpn_for_user0) {
defines += [ "ENABLE_VPN_FOR_USER0" ]
}
- cflags_cc = memory_optimization_cflags_cc
- cflags_cc += [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags + memory_optimization_cflags_cc
if (netmanager_ext_feature_sysvpn) {
cflags += sysvpn_flags
diff --git a/services/wearabledistributednetmanager/BUILD.gn b/services/wearabledistributednetmanager/BUILD.gn
index 452d45d5..966e31ca 100644
--- a/services/wearabledistributednetmanager/BUILD.gn
+++ b/services/wearabledistributednetmanager/BUILD.gn
@@ -34,10 +34,6 @@ config("wearable_distributed_net_manager_config") {
if (enable_netmgr_ext_debug) {
defines += [ "NETMGR_DEBUG" ]
}
-
- if (battery_manager_switch_enable) {
- include_dirs += [ "$BATTERY_INNER_API/native/include" ]
- }
}
wearable_distributed_net_manager_sources = [
@@ -73,7 +69,6 @@ wearable_distributed_net_manager_external_deps = [
"hitrace:hitrace_meter",
"ipc:ipc_core",
"netmanager_base:net_conn_manager_if",
- "netmanager_base:net_conn_parcel",
"netmanager_base:net_data_share",
"netmanager_base:net_manager_common",
"netmanager_base:net_native_manager_if",
@@ -100,23 +95,13 @@ ohos_shared_library("wearable_distributed_net_manager") {
deps = wearable_distributed_net_manager_deps
external_deps = wearable_distributed_net_manager_external_deps
- cflags = memory_optimization_cflags
- cflags += [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
-
if (battery_manager_switch_enable) {
external_deps += [ "battery_manager:batterysrv_client" ]
}
- cflags_cc = memory_optimization_cflags_cc
- cflags_cc += [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags + memory_optimization_cflags
+
+ cflags_cc = common_cflags + memory_optimization_cflags_cc
ldflags = memory_optimization_ldflags
diff --git a/test/ethernetmanager/fuzztest/ethernetclient_fuzzer/BUILD.gn b/test/ethernetmanager/fuzztest/ethernetclient_fuzzer/BUILD.gn
index cbf2ff77..495b48fe 100644
--- a/test/ethernetmanager/fuzztest/ethernetclient_fuzzer/BUILD.gn
+++ b/test/ethernetmanager/fuzztest/ethernetclient_fuzzer/BUILD.gn
@@ -30,8 +30,6 @@ ohos_fuzztest("EthernetClientFuzzTest") {
"$EXT_SECURITY_PATH/security",
"$NETMANAGER_EXT_ROOT/utils/log/include",
"$ETHERNETMANAGER_SOURCE_DIR/include",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
- "$NETCONNMANAGER_COMMON_DIR/include",
"$ETHERNETMANAGER_SOURCE_DIR/include/stub",
]
@@ -61,7 +59,6 @@ ohos_fuzztest("EthernetClientFuzzTest") {
"$ETHERNETMANAGER_SOURCE_DIR:ethernet_manager",
"$EXT_INNERKITS_ROOT/ethernetclient:ethernet_manager_if",
"$NETMANAGER_EXT_ROOT/utils:net_manager_ext_common",
- "$NETSYSCONTROLLER_ROOT_DIR:netsys_controller",
]
external_deps = [
@@ -73,8 +70,10 @@ ohos_fuzztest("EthernetClientFuzzTest") {
"dhcp:dhcp_sdk",
"ffrt:libffrt",
"ipc:ipc_core",
+ "netmanager_base:netsys_controller",
"netmanager_base:net_manager_common",
"netmanager_base:net_native_manager_if",
+ "netmanager_base:net_service_common",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
diff --git a/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn b/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn
index d84b0ae2..88694c3f 100644
--- a/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn
+++ b/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn
@@ -49,16 +49,12 @@ ohos_unittest("ethernet_manager_test") {
"$EXT_SECURITY_PATH/security",
"$ETHERNETMANAGER_SOURCE_DIR/include",
"$ETHERNETMANAGER_SOURCE_DIR/include/stub",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
- "$NETCONNMANAGER_COMMON_DIR/include",
]
deps = [
"$ETHERNETMANAGER_SOURCE_DIR:ethernet_manager",
"$EXT_INNERKITS_ROOT/ethernetclient:ethernet_manager_if",
- "$NETCONNMANAGER_COMMON_DIR:net_service_common",
"$NETMANAGER_EXT_ROOT/utils:net_manager_ext_common",
- "$NETSYSCONTROLLER_ROOT_DIR:netsys_controller",
]
external_deps = [
@@ -70,8 +66,9 @@ ohos_unittest("ethernet_manager_test") {
"dhcp:dhcp_sdk",
"ffrt:libffrt",
"ipc:ipc_core",
+ "netmanager_base:netsys_controller",
"netmanager_base:net_conn_manager_if",
- "netmanager_base:net_conn_parcel",
+ "netmanager_base:net_service_common",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
diff --git a/test/netfirewallmanager/fuzztest/netfirewallclient_fuzzer/BUILD.gn b/test/netfirewallmanager/fuzztest/netfirewallclient_fuzzer/BUILD.gn
index 1d49cada..76e3e7d4 100755
--- a/test/netfirewallmanager/fuzztest/netfirewallclient_fuzzer/BUILD.gn
+++ b/test/netfirewallmanager/fuzztest/netfirewallclient_fuzzer/BUILD.gn
@@ -25,8 +25,6 @@ ohos_fuzztest("netfirewallclient_fuzzer_test") {
"$EXT_INNERKITS_ROOT/include",
"$EXT_SECURITY_PATH/security",
"$NETMANAGER_EXT_ROOT/utils/log/include",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
- "$NETCONNMANAGER_COMMON_DIR/include",
"$NETFIREWALLMANAGER_SOURCE_DIR/include",
"$EXT_INNERKITS_ROOT/netfirewallclient/include",
]
@@ -53,11 +51,8 @@ ohos_fuzztest("netfirewallclient_fuzzer_test") {
deps = [
"$EXT_INNERKITS_ROOT/netfirewallclient:netfirewall_manager_if",
"$EXT_INNERKITS_ROOT/netfirewallclient:netfirewall_parcel",
- "$NETCONNMANAGER_COMMON_DIR:net_service_common",
"$NETFIREWALLMANAGER_SOURCE_DIR:netfirewall_manager_static",
"$NETMANAGER_EXT_ROOT/utils:net_manager_ext_common",
- "$NETMANAGER_EXT_ROOT/utils:net_manager_ext_common",
- "$NETSYSCONTROLLER_ROOT_DIR:netsys_controller",
]
external_deps = [
@@ -73,10 +68,11 @@ ohos_fuzztest("netfirewallclient_fuzzer_test") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
- "netmanager_base:net_conn_parcel",
+ "netmanager_base:netsys_controller",
+ "netmanager_base:net_conn_manager_if",
"netmanager_base:net_manager_common",
"netmanager_base:net_native_manager_if",
- "netmanager_base:net_native_manager_if",
+ "netmanager_base:net_service_common"
"os_account:os_account_innerkits",
]
diff --git a/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn b/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn
index be28fc52..defa6bec 100755
--- a/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn
+++ b/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn
@@ -41,8 +41,6 @@ ohos_unittest("netfirewallmanager_test") {
include_dirs = [
"$EXT_INNERKITS_ROOT/include",
"$EXT_SECURITY_PATH/security",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
- "$NETCONNMANAGER_COMMON_DIR/include",
"$NETFIREWALLMANAGER_SOURCE_DIR/include",
"$EXT_INNERKITS_ROOT/netfirewallclient/include",
"$NETMANAGER_EXT_ROOT/test/netmanager_ext_mock_test",
@@ -51,10 +49,8 @@ ohos_unittest("netfirewallmanager_test") {
deps = [
"$EXT_INNERKITS_ROOT/netfirewallclient:netfirewall_manager_if",
"$EXT_INNERKITS_ROOT/netfirewallclient:netfirewall_parcel",
- "$NETCONNMANAGER_COMMON_DIR:net_service_common",
"$NETFIREWALLMANAGER_SOURCE_DIR:netfirewall_manager_static",
"$NETMANAGER_EXT_ROOT/utils:net_manager_ext_common",
- "$NETSYSCONTROLLER_ROOT_DIR:netsys_controller",
]
external_deps = [
@@ -69,8 +65,10 @@ ohos_unittest("netfirewallmanager_test") {
"ffrt:libffrt",
"hilog:libhilog",
"ipc:ipc_core",
- "netmanager_base:net_conn_parcel",
+ "netmanager_base:netsys_controller",
+ "netmanager_base:net_conn_manager_if",
"netmanager_base:net_native_manager_if",
+ "netmanager_base:net_service_common",
"os_account:os_account_innerkits",
"relational_store:native_rdb",
]
diff --git a/test/networksharemanager/fuzztest/netshareclient_fuzzer/BUILD.gn b/test/networksharemanager/fuzztest/netshareclient_fuzzer/BUILD.gn
index f8087503..c315ef46 100644
--- a/test/networksharemanager/fuzztest/netshareclient_fuzzer/BUILD.gn
+++ b/test/networksharemanager/fuzztest/netshareclient_fuzzer/BUILD.gn
@@ -35,7 +35,6 @@ ohos_fuzztest("NetShareClientFuzzTest") {
"$NETWORKSHAREMANAGER_SOURCE_DIR/include",
"$NETWORKSHAREMANAGER_SOURCE_DIR/include/stub",
"$NETWORKSHAREMANAGER_UTILS_DIR/event_report/include",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
]
if (communication_wifi_switch_enable) {
@@ -79,7 +78,6 @@ ohos_fuzztest("NetShareClientFuzzTest") {
deps = [
"$NETMANAGER_EXT_ROOT/services/networksharemanager:net_tether_manager_static",
- "$NETSYSCONTROLLER_ROOT_DIR:netsys_controller",
]
deps +=
[ "$EXT_INNERKITS_ROOT/netshareclient:netshare_service_interface_stub" ]
@@ -96,6 +94,7 @@ ohos_fuzztest("NetShareClientFuzzTest") {
"hilog:libhilog",
"hisysevent:libhisysevent",
"ipc:ipc_core",
+ "netmanager_base:netsys_controller",
"netmanager_base:net_conn_manager_if",
"netmanager_base:net_manager_common",
"safwk:system_ability_fwk",
diff --git a/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn b/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn
index d524b17e..25a8d9a2 100644
--- a/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn
+++ b/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn
@@ -62,7 +62,6 @@ ohos_unittest("networkshare_manager_test") {
"$NETMANAGER_EXT_ROOT/services/networksharemanager/include/stub",
"$NETMANAGER_EXT_ROOT/services/networksharemanager/include/utils",
"$NETMANAGER_EXT_ROOT/test/netmanager_ext_mock_test",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
]
defines = []
diff --git a/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn b/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn
index fbc6c43d..edbc902d 100644
--- a/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn
+++ b/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn
@@ -75,6 +75,7 @@ ohos_unittest("sys_vpn_manager_test") {
"hilog:libhilog",
"hisysevent:libhisysevent",
"ipc:ipc_core",
+ "netmanager_base:fwmark_client",
"netmanager_base:net_conn_manager_if",
"netmanager_base:net_data_share",
"netmanager_base:net_manager_common",
diff --git a/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn b/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn
index dcb5fb9a..7632efe0 100644
--- a/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn
+++ b/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn
@@ -28,7 +28,6 @@ ohos_unittest("vpn_manager_ext_test") {
sources = [ "networkvpn_service_ext_test.cpp" ]
include_dirs = [
- "$BASE_INNERKITS_ROOT/netconnclient/include/proxy",
"$EXT_INNERKITS_ROOT/include",
"$EXT_INNERKITS_ROOT/netshareclient/include/proxy",
"$EXT_INNERKITS_ROOT/netvpnclient/include",
@@ -37,7 +36,6 @@ ohos_unittest("vpn_manager_ext_test") {
"$NETMANAGER_EXT_ROOT/services/vpnmanager/include",
"$NETMANAGER_EXT_ROOT/services/vpnmanager/include/ipc",
"$NETMANAGER_EXT_ROOT/test/netmanager_ext_mock_test",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
]
deps = [
@@ -58,6 +56,7 @@ ohos_unittest("vpn_manager_ext_test") {
"ffrt:libffrt",
"hilog:libhilog",
"hisysevent:libhisysevent",
+ "netmanager_base:net_conn_manager_if",
"netmanager_base:net_manager_common",
"os_account:os_account_innerkits",
"safwk:system_ability_fwk",
diff --git a/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn b/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn
index c0098cdf..4c2ffab8 100644
--- a/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn
+++ b/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn
@@ -45,7 +45,6 @@ ohos_unittest("vpn_manager_test") {
"$NETMANAGER_EXT_ROOT/services/vpnmanager/include",
"$NETMANAGER_EXT_ROOT/services/vpnmanager/include/ipc",
"$NETMANAGER_EXT_ROOT/test/netmanager_ext_mock_test",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
]
deps = [
@@ -68,6 +67,7 @@ ohos_unittest("vpn_manager_test") {
"hilog:libhilog",
"hisysevent:libhisysevent",
"ipc:ipc_core",
+ "netmanager_base:fwmark_client",
"netmanager_base:net_conn_manager_if",
"netmanager_base:net_manager_common",
"netmanager_base:netsys_controller",
diff --git a/test/wearabledistributednetmanager/unittest/wearable_distributed_net_manager_test/BUILD.gn b/test/wearabledistributednetmanager/unittest/wearable_distributed_net_manager_test/BUILD.gn
index 75cfef07..5deb5739 100644
--- a/test/wearabledistributednetmanager/unittest/wearable_distributed_net_manager_test/BUILD.gn
+++ b/test/wearabledistributednetmanager/unittest/wearable_distributed_net_manager_test/BUILD.gn
@@ -45,19 +45,13 @@ ohos_unittest("wearable_distributed_net_manager_test") {
"$EXT_INNERKITS_ROOT/wearabledistributednetclient/include",
"$EXT_SECURITY_PATH/security",
"$WEARABLE_DISTRIBUTED_NET_MANAGER_SOURCE_DIR/include",
- "$BASE_INNERKITS_ROOT/netconnclient/include",
- "$NETSYSCONTROLLER_ROOT_DIR/include",
- "$NETCONNMANAGER_COMMON_DIR/include",
]
deps = [
- "$BASE_INNERKITS_ROOT/netconnclient:net_conn_parcel",
"$EXT_INNERKITS_ROOT/wearabledistributednetclient:wearable_distributed_net_manager_if",
"$EXT_INNERKITS_ROOT/wearabledistributednetclient:wearable_distributed_net_service",
- "$NETCONNMANAGER_COMMON_DIR:net_service_common",
"$NETMANAGER_EXT_ROOT/services/wearabledistributednetmanager:wearable_distributed_net_manager",
"$NETMANAGER_EXT_ROOT/utils:net_manager_ext_common",
- "$NETSYSCONTROLLER_ROOT_DIR:netsys_controller",
]
external_deps = [
@@ -73,8 +67,10 @@ ohos_unittest("wearable_distributed_net_manager_test") {
"hilog:libhilog",
"hisysevent:libhisysevent",
"ipc:ipc_core",
+ "netmanager_base:netsys_controller",
"netmanager_base:net_conn_manager_if",
"netmanager_base:net_native_manager_if",
+ "netmanager_base:net_service_common",
"samgr:samgr_proxy",
]
@@ -89,7 +85,6 @@ ohos_unittest("wearable_distributed_net_manager_test") {
}
if (battery_manager_switch_enable) {
- include_dirs += [ "$BATTERY_INNER_API/native/include" ]
external_deps += [ "battery_manager:batterysrv_client" ]
}
diff --git a/utils/BUILD.gn b/utils/BUILD.gn
index 6e4a8f4a..61e699b4 100644
--- a/utils/BUILD.gn
+++ b/utils/BUILD.gn
@@ -53,24 +53,13 @@ ohos_shared_library("net_manager_ext_common") {
public_external_deps = [ "c_utils:utils" ]
- cflags = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags
+ cflags_cc = common_cflags
if (is_double_framework) {
- cflags_cc = [ "-DCONFIG_DUAL_FRAMEWORK" ]
- cflags_cc += [ "-fstack-protector-strong" ]
- } else {
- cflags_cc = [ "-fstack-protector-strong" ]
+ cflags_cc += [ "-DCONFIG_DUAL_FRAMEWORK" ]
}
- cflags_cc += [
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
-
if (is_standard_system) {
external_deps = [
"c_utils:utils",
@@ -97,17 +86,9 @@ ohos_shared_library("net_event_report") {
branch_protector_ret = "pac_ret"
- cflags = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags = common_cflags
- cflags_cc = [
- "-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
- "-O2",
- ]
+ cflags_cc = common_cflags
sources = [ "event_report/src/net_event_report.cpp" ]
--
Gitee