From 3d732c4768f1e18693328b29616d2191f3e85bfb Mon Sep 17 00:00:00 2001 From: meng-xinhai Date: Thu, 13 Feb 2025 16:00:27 +0800 Subject: [PATCH 1/2] 123 Signed-off-by: meng-xinhai --- services/service/BUILD.gn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index 3bb498b3f..dd594e1ff 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -170,8 +170,11 @@ if (defined(ohos_lite)) { cflags = [ "-fPIC", "-fstack-protector-strong", + "-fvisibility=hidden", ] + cflags_cc = cflags + ldflags = [ "-Wl,-z,relro", "-Wl,-z,now", -- Gitee From d6a2613faa85bd54d84cc56986efbb0c453285b5 Mon Sep 17 00:00:00 2001 From: meng-xinhai Date: Tue, 18 Feb 2025 10:37:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: meng-xinhai --- services/service/BUILD.gn | 143 +++++++++++++++++- .../authenticatedeviceservice_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../dmauthmanager_fuzzer/BUILD.gn | 2 +- .../dmdiscoverymanager_fuzzer/BUILD.gn | 2 +- .../generateencrypteduuid_fuzzer/BUILD.gn | 2 +- .../getdeviceinfo_fuzzer/BUILD.gn | 2 +- .../hichainconnector_fuzzer/BUILD.gn | 2 +- .../ondatareceived_fuzzer/BUILD.gn | 2 +- test/commonfuzztest/onerror_fuzzer/BUILD.gn | 2 +- test/commonfuzztest/onfinish_fuzzer/BUILD.gn | 2 +- test/commonfuzztest/onrequest_fuzzer/BUILD.gn | 2 +- test/commonfuzztest/pinauth_fuzzer/BUILD.gn | 2 +- test/commonfuzztest/pinauthui_fuzzer/BUILD.gn | 2 +- test/commonfuzztest/pinholder_fuzzer/BUILD.gn | 2 +- .../devicemanagerservice_fuzzer/BUILD.gn | 2 +- .../deviceprofileconnector_fuzzer/BUILD.gn | 2 +- .../getlocaldeviceinfo_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../ipcserverclientproxy_fuzzer/BUILD.gn | 2 +- .../ipcserverlistener_fuzzer/BUILD.gn | 2 +- .../ipcserverstub_fuzzer/BUILD.gn | 2 +- .../notifyevent_fuzzer/BUILD.gn | 2 +- .../shiftlnngeardeviceservice_fuzzer/BUILD.gn | 2 +- .../closedmradarhelperobj_fuzzer/BUILD.gn | 2 +- .../onbytesreceived_fuzzer/BUILD.gn | 2 +- .../onparameterchgcallback_fuzzer/BUILD.gn | 2 +- .../onsessionopened_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../onsoftbusdeviceoffline_fuzzer/BUILD.gn | 2 +- .../onsoftbusdeviceonline_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../publishsoftbuslnn_fuzzer/BUILD.gn | 2 +- .../refreshsoftbuslnn_fuzzer/BUILD.gn | 2 +- .../softbusconnectorregister_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../softbussessionobject_fuzzer/BUILD.gn | 2 +- .../stoprefreshsoftbuslnn_fuzzer/BUILD.gn | 2 +- test/unittest/BUILD.gn | 4 +- 39 files changed, 181 insertions(+), 40 deletions(-) diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index dd594e1ff..df485aeb1 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -173,7 +173,148 @@ if (defined(ohos_lite)) { "-fvisibility=hidden", ] - cflags_cc = cflags + cflags_cc = [ "-fvisibility=hidden" ] + + ldflags = [ + "-Wl,-z,relro", + "-Wl,-z,now", + ] + + sources = [ + "${common_path}/src/dfx/standard/dm_hidumper.cpp", + "${common_path}/src/dm_anonymous.cpp", + "${common_path}/src/ipc/standard/ipc_cmd_register.cpp", + "${common_path}/src/ipc/standard/ipc_model_codec.cpp", + "src/advertise/advertise_manager.cpp", + "src/device_manager_service.cpp", + "src/device_manager_service_listener.cpp", + "src/devicenamemgr/account_boot_listener.cpp", + "src/devicenamemgr/device_name_change_monitor.cpp", + "src/devicenamemgr/device_name_manager.cpp", + "src/devicenamemgr/local_device_name_mgr.cpp", + "src/devicenamemgr/settings_data_event_monitor.cpp", + "src/discovery/discovery_filter.cpp", + "src/discovery/discovery_manager.cpp", + "src/hichain/hichain_listener.cpp", + "src/ipc/standard/ipc_cmd_parser.cpp", + "src/ipc/standard/ipc_server_client_proxy.cpp", + "src/ipc/standard/ipc_server_listener.cpp", + "src/ipc/standard/ipc_server_stub.cpp", + "src/notify/device_manager_service_notify.cpp", + "src/permission/standard/permission_manager.cpp", + "src/pinholder/pin_holder.cpp", + "src/pinholder/pin_holder_session.cpp", + "src/publishcommonevent/dm_account_common_event.cpp", + "src/publishcommonevent/dm_data_share_common_event.cpp", + "src/publishcommonevent/dm_package_common_event.cpp", + "src/publishcommonevent/dm_screen_common_event.cpp", + "src/relationshipsyncmgr/dm_comm_tool.cpp", + "src/relationshipsyncmgr/dm_transport.cpp", + "src/relationshipsyncmgr/dm_transport_msg.cpp", + "src/relationshipsyncmgr/relationship_sync_mgr.cpp", + "src/softbus/mine_softbus_listener.cpp", + "src/softbus/softbus_listener.cpp", + ] + + public_configs = [ ":devicemanagerservice_config" ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerservice\"", + "LOG_DOMAIN=0xD004110", + ] + + deps = [ + "${devicemanager_path}/commondependency:devicemanagerdependency", + "${devicemanager_path}/radar:devicemanagerradar", + "${softbuscache_parh}:dmdevicecache", + "${utils_path}:devicemanagerutils", + ] + + external_deps = [ + "ability_base:want", + "access_token:libaccesstoken_sdk", + "access_token:libtokenid_sdk", + "bundle_framework:appexecfwk_base", + "cJSON:cjson", + "c_utils:utils", + "common_event_service:cesfwk_core", + "common_event_service:cesfwk_innerkits", + "data_share:datashare_common", + "data_share:datashare_consumer", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "ffrt:libffrt", + "hicollie:libhicollie", + "hilog:libhilog", + "init:libbeget_proxy", + "init:libbegetutil", + "ipc:ipc_core", + "ipc:ipc_single", + "openssl:libcrypto_shared", + "os_account:libaccountkits", + "os_account:os_account_innerkits", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] + + if (support_bluetooth || support_wifi) { + sources += [ + "src/publishcommonevent/dm_publish_common_event.cpp", + "src/softbus/softbus_publish.cpp", + ] + } + + if (support_bluetooth) { + defines += [ "SUPPORT_BLUETOOTH" ] + external_deps += [ "bluetooth:btframework" ] + } + + if (support_wifi) { + defines += [ "SUPPORT_WIFI" ] + external_deps += [ "wifi:wifi_sdk" ] + } + + if (support_power_manager) { + defines += [ "SUPPORT_POWER_MANAGER" ] + external_deps += [ "power_manager:powermgr_client" ] + } + + if (support_memmgr) { + defines += [ "SUPPORT_MEMMGR" ] + external_deps += [ "memmgr:memmgrclient" ] + } + + if (device_manager_common) { + defines += [ "DEVICE_MANAGER_COMMON_FLAG" ] + } + + public_external_deps = [ "json:nlohmann_json_static" ] + + subsystem_name = "distributedhardware" + + part_name = "device_manager" + } + + ohos_shared_library("devicemanagerservicestatic") { + branch_protector_ret = "pac_ret" + + sanitize = { + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = false + integer_overflow = true + ubsan = true + } + + cflags = [ + "-fPIC", + "-fstack-protector-strong", + ] ldflags = [ "-Wl,-z,relro", diff --git a/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn index 38fd02bf5..3564e0baf 100644 --- a/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn @@ -56,7 +56,7 @@ ohos_fuzztest("AuthenticateDeviceServiceFuzzTest") { sources = [ "authenticate_device_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn index c626f803e..e66987337 100644 --- a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn @@ -57,7 +57,7 @@ ohos_fuzztest("AuthenticateDeviceServiceImplFuzzTest") { deps = [ "${devicemanager_path}/services/implementation:devicemanagerserviceimpl", - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn b/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn index 3c7e38281..dcd7ba59e 100644 --- a/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("DmAuthManagerFuzzTest") { sources = [ "dm_auth_manager_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn b/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn index c2e7053b7..024c2fe22 100644 --- a/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("DmDiscoveryManagerFuzzTest") { sources = [ "dm_discovery_manager_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn b/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn index 8583d6818..083b68ba3 100644 --- a/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn +++ b/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("GenerateEncryptedUuidFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn b/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn index 59c824565..a65e052c4 100644 --- a/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn +++ b/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("GetDeviceInfoFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn b/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn index 94cc1e499..b178cf06c 100644 --- a/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn +++ b/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("HichainConnectorFuzzTest") { sources = [ "hichain_connector_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn b/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn index ce95aff04..ef1fb1eac 100644 --- a/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn +++ b/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("OnDataReceivedFuzzTest") { sources = [ "on_data_received_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/onerror_fuzzer/BUILD.gn b/test/commonfuzztest/onerror_fuzzer/BUILD.gn index 88eb9d5d9..29fbc7da6 100644 --- a/test/commonfuzztest/onerror_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onerror_fuzzer/BUILD.gn @@ -43,7 +43,7 @@ ohos_fuzztest("OnErrorFuzzTest") { sources = [ "on_error_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/onfinish_fuzzer/BUILD.gn b/test/commonfuzztest/onfinish_fuzzer/BUILD.gn index ccdf45e24..e4af5d7c1 100644 --- a/test/commonfuzztest/onfinish_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onfinish_fuzzer/BUILD.gn @@ -43,7 +43,7 @@ ohos_fuzztest("OnFinishFuzzTest") { sources = [ "on_finish_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/onrequest_fuzzer/BUILD.gn b/test/commonfuzztest/onrequest_fuzzer/BUILD.gn index 94a50c7c0..882f222d2 100644 --- a/test/commonfuzztest/onrequest_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onrequest_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("OnRequestFuzzTest") { sources = [ "on_request_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/pinauth_fuzzer/BUILD.gn b/test/commonfuzztest/pinauth_fuzzer/BUILD.gn index b35c7bceb..2f44029c3 100644 --- a/test/commonfuzztest/pinauth_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinauth_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("PinAuthFuzzTest") { deps = [ "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn b/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn index edb277b77..49c296f45 100644 --- a/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn @@ -65,7 +65,7 @@ ohos_fuzztest("PinAuthUiFuzzTest") { deps = [ "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/pinholder_fuzzer/BUILD.gn b/test/commonfuzztest/pinholder_fuzzer/BUILD.gn index ad3d330ad..d3c776b9b 100644 --- a/test/commonfuzztest/pinholder_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinholder_fuzzer/BUILD.gn @@ -65,7 +65,7 @@ ohos_fuzztest("PinHolderFuzzTest") { deps = [ "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn b/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn index a0aec1889..4089df8b2 100644 --- a/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn @@ -57,7 +57,7 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") { sources = [ "device_manager_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] diff --git a/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn b/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn index 79e46a79f..4aa63a58a 100644 --- a/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn @@ -36,7 +36,7 @@ ohos_fuzztest("DeviceProfileConnectorFuzzTest") { deps = [ "${devicemanager_path}/commondependency:devicemanagerdependency", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn b/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn index b9d4a3da8..37a3d88e8 100644 --- a/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("GetLocalDeviceInfoFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn b/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn index 5f55db916..cf13c0dd2 100644 --- a/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn @@ -57,7 +57,7 @@ ohos_fuzztest("GetTrustedDeviceListServiceFuzzTest") { sources = [ "get_trusted_devicelist_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] diff --git a/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn index 13ad91b39..c152eaced 100644 --- a/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { sources = [ "ipc_server_client_proxy_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${innerkits_path}/native_cpp:devicemanagersdk", ] diff --git a/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn index 7de171284..be8b06245 100644 --- a/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { sources = [ "ipc_server_listener_fuzzer.cpp" ] - deps = [ "${devicemanager_path}/services/service:devicemanagerservice" ] + deps = [ "${devicemanager_path}/services/service:devicemanagerservicestatic" ] external_deps = [ "c_utils:utils", diff --git a/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn index 737b7b187..04220b6b6 100644 --- a/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("IpcServerStubFuzzTest") { sources = [ "ipc_server_stub_fuzzer.cpp" ] - deps = [ "${devicemanager_path}/services/service:devicemanagerservice" ] + deps = [ "${devicemanager_path}/services/service:devicemanagerservicestatic" ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn b/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn index 8368419a0..ffeb35e9e 100644 --- a/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("NotifyEventFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn b/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn index 8e4e284ef..5bc45d684 100644 --- a/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn @@ -57,7 +57,7 @@ ohos_fuzztest("ShiftLNNGearDeviceServiceFuzzTest") { sources = [ "shift_lnn_gear_device_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn b/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn index e032218e8..a93d3c086 100644 --- a/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("CloseDmRadarHelperObjFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn b/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn index 558005b02..d9f8d3c13 100644 --- a/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("OnBytesReceivedFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn b/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn index f95facaf5..bf4538973 100644 --- a/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("OnParameterChgCallbackFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn b/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn index 251ac8797..14d25d578 100644 --- a/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("OnSessionOpenedFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn index 0cb1e7b21..dc80b4929 100644 --- a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn @@ -40,7 +40,7 @@ ohos_fuzztest("OnSoftbusDeviceInfoChangedFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn index ecf137944..dfd2ecdcb 100644 --- a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("OnSoftbusDeviceOfflineFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn index 049ffdb53..7df6bc67d 100644 --- a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("OnSoftbusDeviceOnlineFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn index 6bc275719..85fb21075 100644 --- a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn @@ -40,7 +40,7 @@ ohos_fuzztest("OnSoftbusListenerDeviceFoundFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn index 8a1a5e385..cc8899da0 100644 --- a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("PublishSoftbusLnnFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn index 731f97cc5..f09ad4bba 100644 --- a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("RefreshSoftbusLnnFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn index 7a89dc7d7..104934bc2 100644 --- a/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn @@ -45,7 +45,7 @@ ohos_fuzztest("SoftbusConnectorRegisterFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn index caea4d6ff..27def9bce 100644 --- a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("SoftbusListenerGetLocalDeviceInfoFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn b/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn index 3d8a70206..774ab17e7 100644 --- a/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn @@ -46,7 +46,7 @@ ohos_fuzztest("SoftbusSessionObjectFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn index b69e49882..564aa7694 100644 --- a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("StopRefreshSoftbusLnnFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index d47d3f153..0dbbaa605 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -528,7 +528,7 @@ ohos_unittest("UTTest_mine_softbus_listener") { deps = [ ":device_manager_test_common", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] @@ -1769,7 +1769,7 @@ ohos_static_library("device_manager_test_common") { "${devicemanager_path}/radar:devicemanagerradar", "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", -- Gitee