From 28f69522634722db90d131abbd4f13981b8f32de Mon Sep 17 00:00:00 2001 From: l00635678 Date: Tue, 1 Jul 2025 14:37:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=8B=AC=E7=AB=8B=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l00635678 --- services/ethernetmanager/BUILD.gn | 1 + services/networksharemanager/BUILD.gn | 1 + test/ethernetmanager/fuzztest/ethernetclient_fuzzer/BUILD.gn | 3 ++- test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn | 3 ++- .../ethernet_manager_test/ethernet_service_proxy_test.cpp | 1 - test/mdnsmanager/unittest/mdns_manager_test/BUILD.gn | 2 +- .../fuzztest/netfirewallclient_fuzzer/BUILD.gn | 2 +- .../unittest/netfirewallmanager_test/BUILD.gn | 2 +- .../fuzztest/netshareclient_fuzzer/BUILD.gn | 3 ++- .../unittest/networkshare_manager_test/BUILD.gn | 2 +- .../unittest/networkslice_manager_test/BUILD.gn | 2 +- test/vpnmanager/fuzztest/vpnclient_fuzzer/BUILD.gn | 3 ++- test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn | 2 +- test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn | 2 +- test/vpnmanager/unittest/vpn_manager_test/BUILD.gn | 2 +- .../unittest/wearable_distributed_net_manager_test/BUILD.gn | 2 +- 16 files changed, 19 insertions(+), 14 deletions(-) diff --git a/services/ethernetmanager/BUILD.gn b/services/ethernetmanager/BUILD.gn index 5e8351a3..05ba2361 100644 --- a/services/ethernetmanager/BUILD.gn +++ b/services/ethernetmanager/BUILD.gn @@ -96,4 +96,5 @@ ohos_prebuilt_etc("ethernet_interfaces") { install_enable = true relative_install_dir = "communication/netmanager_ext" part_name = "netmanager_ext" + subsystem_name = "communication" } diff --git a/services/networksharemanager/BUILD.gn b/services/networksharemanager/BUILD.gn index f0bdb97a..273977b2 100644 --- a/services/networksharemanager/BUILD.gn +++ b/services/networksharemanager/BUILD.gn @@ -278,4 +278,5 @@ ohos_prebuilt_etc("network_share_config") { install_enable = true relative_install_dir = "communication/netmanager_ext" part_name = "netmanager_ext" + subsystem_name = "communication" } diff --git a/test/ethernetmanager/fuzztest/ethernetclient_fuzzer/BUILD.gn b/test/ethernetmanager/fuzztest/ethernetclient_fuzzer/BUILD.gn index b8966f5f..63a5ea42 100644 --- a/test/ethernetmanager/fuzztest/ethernetclient_fuzzer/BUILD.gn +++ b/test/ethernetmanager/fuzztest/ethernetclient_fuzzer/BUILD.gn @@ -63,11 +63,12 @@ ohos_fuzztest("EthernetClientFuzzTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "cJSON:cjson", "c_utils:utils", "dhcp:dhcp_sdk", + "eventhandler:libeventhandler", "ffrt:libffrt", "ipc:ipc_core", "netmanager_base:netsys_controller", diff --git a/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn b/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn index f16f5de5..dbe3fedf 100644 --- a/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn +++ b/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn @@ -61,11 +61,12 @@ ohos_unittest("ethernet_manager_test") { external_deps = [ "c_utils:utils", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bounds_checking_function:libsec_shared", "cJSON:cjson", "dhcp:dhcp_sdk", + "eventhandler:libeventhandler", "ffrt:libffrt", "init:libbegetutil", "ipc:ipc_core", diff --git a/test/ethernetmanager/unittest/ethernet_manager_test/ethernet_service_proxy_test.cpp b/test/ethernetmanager/unittest/ethernet_manager_test/ethernet_service_proxy_test.cpp index c8375c9a..50733d44 100644 --- a/test/ethernetmanager/unittest/ethernet_manager_test/ethernet_service_proxy_test.cpp +++ b/test/ethernetmanager/unittest/ethernet_manager_test/ethernet_service_proxy_test.cpp @@ -36,7 +36,6 @@ #define protected public #include "ethernet_client.h" #include "ethernet_dhcp_controller.h" -#include "ethernet_service.h" #include "ethernet_management.h" #include "ethernet_service_proxy.h" diff --git a/test/mdnsmanager/unittest/mdns_manager_test/BUILD.gn b/test/mdnsmanager/unittest/mdns_manager_test/BUILD.gn index c32f8176..00bb3421 100644 --- a/test/mdnsmanager/unittest/mdns_manager_test/BUILD.gn +++ b/test/mdnsmanager/unittest/mdns_manager_test/BUILD.gn @@ -51,7 +51,7 @@ ohos_unittest("mdns_manager_test") { external_deps = [ "c_utils:utils", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bounds_checking_function:libsec_shared", "common_event_service:cesfwk_innerkits", diff --git a/test/netfirewallmanager/fuzztest/netfirewallclient_fuzzer/BUILD.gn b/test/netfirewallmanager/fuzztest/netfirewallclient_fuzzer/BUILD.gn index 5570ccb0..5d098b12 100755 --- a/test/netfirewallmanager/fuzztest/netfirewallclient_fuzzer/BUILD.gn +++ b/test/netfirewallmanager/fuzztest/netfirewallclient_fuzzer/BUILD.gn @@ -56,7 +56,7 @@ ohos_fuzztest("netfirewallclient_fuzzer_test") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn b/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn index 26ed8ab4..21500fae 100755 --- a/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn +++ b/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn @@ -55,7 +55,7 @@ ohos_unittest("netfirewallmanager_test") { external_deps = [ "c_utils:utils", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/networksharemanager/fuzztest/netshareclient_fuzzer/BUILD.gn b/test/networksharemanager/fuzztest/netshareclient_fuzzer/BUILD.gn index 6d18a97b..7eb5372f 100644 --- a/test/networksharemanager/fuzztest/netshareclient_fuzzer/BUILD.gn +++ b/test/networksharemanager/fuzztest/netshareclient_fuzzer/BUILD.gn @@ -76,12 +76,13 @@ ohos_fuzztest("NetShareClientFuzzTest") { [ "$EXT_INNERKITS_ROOT/netshareclient:netshare_service_interface_stub" ] external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bluetooth:btframework", "c_utils:utils", "common_event_service:cesfwk_innerkits", "dhcp:dhcp_sdk", + "eventhandler:libeventhandler", "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", diff --git a/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn b/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn index 7b6e3830..fa831104 100644 --- a/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn +++ b/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn @@ -87,7 +87,7 @@ ohos_unittest("networkshare_manager_test") { "ability_runtime:extension_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bluetooth:btframework", "common_event_service:cesfwk_innerkits", diff --git a/test/networkslicemanager/unittest/networkslice_manager_test/BUILD.gn b/test/networkslicemanager/unittest/networkslice_manager_test/BUILD.gn index c21ad0ee..fe612476 100644 --- a/test/networkslicemanager/unittest/networkslice_manager_test/BUILD.gn +++ b/test/networkslicemanager/unittest/networkslice_manager_test/BUILD.gn @@ -65,7 +65,7 @@ ohos_unittest("networkslice_manager_test") { "c_utils:utils", "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/vpnmanager/fuzztest/vpnclient_fuzzer/BUILD.gn b/test/vpnmanager/fuzztest/vpnclient_fuzzer/BUILD.gn index 02d13b6c..7e52ad6b 100644 --- a/test/vpnmanager/fuzztest/vpnclient_fuzzer/BUILD.gn +++ b/test/vpnmanager/fuzztest/vpnclient_fuzzer/BUILD.gn @@ -64,11 +64,12 @@ ohos_fuzztest("VpnClientFuzzTest") { external_deps = [ "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_core", "cJSON:cjson", "c_utils:utils", + "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", "hisysevent:libhisysevent", diff --git a/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn b/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn index 0cb1ac12..1d565d1d 100644 --- a/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn +++ b/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn @@ -67,7 +67,7 @@ ohos_unittest("sys_vpn_manager_test") { "c_utils:utils", "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn b/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn index 103e278e..71c919bb 100644 --- a/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn +++ b/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn @@ -48,7 +48,7 @@ ohos_unittest("vpn_manager_ext_test") { "c_utils:utils", "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn b/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn index 5f79bfd0..5b77dc46 100644 --- a/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn +++ b/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn @@ -58,7 +58,7 @@ ohos_unittest("vpn_manager_test") { "c_utils:utils", "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", 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 08284cc3..203b9153 100644 --- a/test/wearabledistributednetmanager/unittest/wearable_distributed_net_manager_test/BUILD.gn +++ b/test/wearabledistributednetmanager/unittest/wearable_distributed_net_manager_test/BUILD.gn @@ -56,7 +56,7 @@ ohos_unittest("wearable_distributed_net_manager_test") { external_deps = [ "c_utils:utils", "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", -- Gitee