From 87b50164beb2bce67e2a2fea23b9dbc461300426 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Sat, 24 Aug 2024 10:48:33 +0800 Subject: [PATCH] =?UTF-8?q?modify=20gn=20=EF=BC=88cherry=20picked=20commit?= =?UTF-8?q?=20from=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- audiohandler/test/unittest/BUILD.gn | 17 +++------- common/dfx_utils/test/unittest/BUILD.gn | 12 ++----- common/test/unittest/BUILD.gn | 10 ++---- .../onremotesinksvrdied_fuzzer/BUILD.gn | 8 +---- .../onremotesourcesvrdied_fuzzer/BUILD.gn | 8 +---- .../sinkhandlerfinishstartsa_fuzzer/BUILD.gn | 8 +---- .../sinkhandlerinitsink_fuzzer/BUILD.gn | 12 +++---- .../BUILD.gn | 12 +++---- .../BUILD.gn | 10 +----- .../BUILD.gn | 12 +++---- .../BUILD.gn | 12 +++---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../sinkproxydaudionotify_fuzzer/BUILD.gn | 8 +---- .../sinkproxyinitsink_fuzzer/BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../sourcehandlerinitsource_fuzzer/BUILD.gn | 8 +---- .../BUILD.gn | 10 +----- .../BUILD.gn | 10 +----- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../sourceproxydaudionotify_fuzzer/BUILD.gn | 8 +---- .../sourceproxyinitsource_fuzzer/BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../test/unittest/audiosinktest/BUILD.gn | 13 ++----- .../test/unittest/audiosourcetest/BUILD.gn | 15 ++------ .../test/unittest/micclient/BUILD.gn | 15 ++++---- .../test/unittest/spkclient/BUILD.gn | 13 +++---- .../test/unittest/controlsink/BUILD.gn | 16 ++++----- .../test/unittest/controlsource/BUILD.gn | 13 +++---- .../test/unittest/daudio_hdi_handler/BUILD.gn | 13 +++---- .../unittest/daudio_manager_callback/BUILD.gn | 8 ++--- .../sinkservicedaudionotify_fuzzer/BUILD.gn | 8 +---- .../sinkserviceinitsink_fuzzer/BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../sinkservicereleasesink_fuzzer/BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../BUILD.gn | 8 +---- .../sinkstubdaudiosinkstub_fuzzer/BUILD.gn | 8 +---- .../sinkstubonremoterequest_fuzzer/BUILD.gn | 8 +---- .../BUILD.gn | 14 ++------ .../sourceservicedaudionotify_fuzzer/BUILD.gn | 14 ++------ .../sourceserviceinitsource_fuzzer/BUILD.gn | 14 ++------ .../BUILD.gn | 14 ++------ .../BUILD.gn | 14 ++------ .../BUILD.gn | 14 ++------ .../test/unittest/managersink/BUILD.gn | 17 +++------- .../test/unittest/servicesink/BUILD.gn | 25 ++++---------- .../test/unittest/servicesource/BUILD.gn | 29 +++++----------- .../test/unittest/sourcedevice/BUILD.gn | 34 +++++++++---------- .../test/unittest/sourcemanager/BUILD.gn | 16 +++------ .../unittest/common/directprocessor/BUILD.gn | 11 +++--- .../test/unittest/receiverengine/BUILD.gn | 11 +++--- .../engineutils/include/engine_test_utils.h | 6 ++-- .../test/unittest/senderengine/BUILD.gn | 11 +++--- .../common/test/unittest/audiodata/BUILD.gn | 7 ++-- 70 files changed, 176 insertions(+), 586 deletions(-) diff --git a/audiohandler/test/unittest/BUILD.gn b/audiohandler/test/unittest/BUILD.gn index 79f9e3cb..57f9b1c3 100644 --- a/audiohandler/test/unittest/BUILD.gn +++ b/audiohandler/test/unittest/BUILD.gn @@ -20,15 +20,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${fwk_common_path}/utils/include", - "${mediastandard_path}/interfaces/inner_api/native", - "${mediastandard_path}/services/utils/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiomanager/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${distributedaudio_path}/audiohandler/include", @@ -44,15 +35,15 @@ ohos_unittest("AudioHandlerTest") { configs = [ ":module_private_config" ] - deps = [ - "${distributedaudio_path}/audiohandler:distributed_audio_handler", - "//third_party/googletest:gtest_main", - ] + deps = [ "${distributedaudio_path}/audiohandler:distributed_audio_handler" ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", ] } diff --git a/common/dfx_utils/test/unittest/BUILD.gn b/common/dfx_utils/test/unittest/BUILD.gn index 9ccb142d..a48b7651 100644 --- a/common/dfx_utils/test/unittest/BUILD.gn +++ b/common/dfx_utils/test/unittest/BUILD.gn @@ -34,8 +34,6 @@ config("module_private_config") { "${common_path}/include", "${common_path}/dfx_utils/include", "${distributedaudio_path}/audiohandler/include", - "${driver_audio_path}/include", - "${hdf_service_path}/hdi_service/common/include", "${interfaces_path}/inner_kits/native_cpp/audio_sink/include", "${interfaces_path}/inner_kits/native_cpp/audio_source/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -44,11 +42,6 @@ config("module_private_config") { "${services_path}/common/audiodata/include", "${services_path}/common/audioeventcallback", "${services_path}/audiomanager/managersource/include", - "${fwk_common_path}/utils/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", - "${mediastandardfwk_path}/audiomanager/include", ] } @@ -74,17 +67,18 @@ ohos_unittest("DAudioDfxTest") { deps = [ "${services_path}/audiomanager/servicesource:distributed_audio_source", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ "audio_framework:audio_capturer", + "audio_framework:audio_client", "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", "dsoftbus:softbus_client", + "googletest:gmock", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/common/test/unittest/BUILD.gn b/common/test/unittest/BUILD.gn index ba2fef4a..95bbdada 100644 --- a/common/test/unittest/BUILD.gn +++ b/common/test/unittest/BUILD.gn @@ -21,9 +21,7 @@ module_output_path = "distributed_audio/common/daudio_util_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "${common_path}/include", "include", ] @@ -36,14 +34,12 @@ ohos_unittest("DaudioUtilsTest") { configs = [ ":module_private_config" ] - deps = [ - "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gtest_main", - ] + deps = [ "${services_path}/common:distributed_audio_utils" ] external_deps = [ "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesinksvrdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesinksvrdied_fuzzer/BUILD.gn index bc4c665c..ab6491ff 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesinksvrdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesinksvrdied_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("OnRemoteSinkSvrDiedFuzzTest") { sources = [ "onremotesinksvrdied_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("OnRemoteSinkSvrDiedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesourcesvrdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesourcesvrdied_fuzzer/BUILD.gn index f4dff95c..b2680161 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesourcesvrdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onremotesourcesvrdied_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("OnRemoteSourceSvrDiedFuzzTest") { sources = [ "onremotesourcesvrdied_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -55,6 +48,7 @@ ohos_fuzztest("OnRemoteSourceSvrDiedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerfinishstartsa_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerfinishstartsa_fuzzer/BUILD.gn index 1e4aa56f..fd0eabae 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerfinishstartsa_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerfinishstartsa_fuzzer/BUILD.gn @@ -30,13 +30,6 @@ ohos_fuzztest("SinkHandlerFinishStartSAFuzzTest") { sources = [ "sinkhandlerfinishstartsa_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -53,6 +46,7 @@ ohos_fuzztest("SinkHandlerFinishStartSAFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn index 5fb5339e..df0da7ae 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { sources = [ "sinkhandlerinitsink_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -46,7 +39,10 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { deps = [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", + ] defines = [ "HI_LOG_ENABLE", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerpausedistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerpausedistributedhardware_fuzzer/BUILD.gn index d56fa2b9..dd472da6 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerpausedistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerpausedistributedhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkHandlerPauseDistributedHardwareFuzzTest") { sources = [ "sinkhandlerpausedistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -46,7 +39,10 @@ ohos_fuzztest("SinkHandlerPauseDistributedHardwareFuzzTest") { deps = [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", + ] defines = [ "HI_LOG_ENABLE", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerregisterprivacyresources_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerregisterprivacyresources_fuzzer/BUILD.gn index c3bda4c4..2d98fbf7 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerregisterprivacyresources_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerregisterprivacyresources_fuzzer/BUILD.gn @@ -31,19 +31,10 @@ ohos_fuzztest("SinkHandlerRegisterPrivacyResourcesFuzzTest") { sources = [ "sinkhandlerregisterprivacyresources_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", "${innerkits_path}/native_cpp/test/include", - "${fwk_services_path}/distributedhardwarefwkservice/include", - "${fwk_services_path}/distributedhardwarefwkservice/include/componentmanager", ] deps = @@ -51,6 +42,7 @@ ohos_fuzztest("SinkHandlerRegisterPrivacyResourcesFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerresumedistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerresumedistributedhardware_fuzzer/BUILD.gn index 399a6eba..c4220b9d 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerresumedistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerresumedistributedhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkHandlerResumeDistributedHardwareFuzzTest") { sources = [ "sinkhandlerresumedistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -46,7 +39,10 @@ ohos_fuzztest("SinkHandlerResumeDistributedHardwareFuzzTest") { deps = [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", + ] defines = [ "HI_LOG_ENABLE", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerstopdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerstopdistributedhardware_fuzzer/BUILD.gn index 34194f27..0d906a93 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerstopdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerstopdistributedhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkHandlerStopDistributedHardwareFuzzTest") { sources = [ "sinkhandlerstopdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -46,7 +39,10 @@ ohos_fuzztest("SinkHandlerStopDistributedHardwareFuzzTest") { deps = [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", + ] defines = [ "HI_LOG_ENABLE", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn index 5bfdc952..1c9223ca 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") { sources = [ "sinkhandlersubscribelocalhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -48,6 +41,7 @@ ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn index 30d66e89..68ea68d7 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") { sources = [ "sinkhandlerunsubscribelocalhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -48,6 +41,7 @@ ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonnotifyresourceinfo_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonnotifyresourceinfo_fuzzer/BUILD.gn index 2843357e..a4731dc4 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonnotifyresourceinfo_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonnotifyresourceinfo_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkIpcCallbackOnNotifyResourceInfoFuzzTest") { sources = [ "sinkipccallbackonnotifyresourceinfo_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkIpcCallbackOnNotifyResourceInfoFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonnotifyresourceinfoinner_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonnotifyresourceinfoinner_fuzzer/BUILD.gn index e15a8c1b..0a83b5aa 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonnotifyresourceinfoinner_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonnotifyresourceinfoinner_fuzzer/BUILD.gn @@ -33,13 +33,6 @@ ohos_fuzztest("SinkIpcCallbackOnNotifyResourceInfoInnerFuzzTest") { sources = [ "sinkipccallbackonnotifyresourceinfoinner_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -56,6 +49,7 @@ ohos_fuzztest("SinkIpcCallbackOnNotifyResourceInfoInnerFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonremoterequest_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonremoterequest_fuzzer/BUILD.gn index 0f07c228..62fda7d7 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonremoterequest_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkipccallbackonremoterequest_fuzzer/BUILD.gn @@ -33,13 +33,6 @@ ohos_fuzztest("SinkIpcCallbackOnRemoteRequestFuzzTest") { sources = [ "sinkipccallbackonremoterequest_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -56,6 +49,7 @@ ohos_fuzztest("SinkIpcCallbackOnRemoteRequestFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn index 1ea9b07a..bc310fb1 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn @@ -30,13 +30,6 @@ ohos_fuzztest("SinkOnLoadSystemAbilityFailFuzzTest") { sources = [ "sinkonloadsystemabilityfail_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -53,6 +46,7 @@ ohos_fuzztest("SinkOnLoadSystemAbilityFailFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn index 75aa5b1b..9b1e0b53 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkOnLoadSystemAbilitySuccessFuzzTest") { sources = [ "sinkonloadsystemabilitysuccess_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkOnLoadSystemAbilitySuccessFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxydaudionotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxydaudionotify_fuzzer/BUILD.gn index 3e143bcc..63a91e9b 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxydaudionotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxydaudionotify_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkProxyDAudioNotifyFuzzTest") { sources = [ "sinkproxydaudionotify_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkProxyDAudioNotifyFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn index d187ea77..705503db 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkProxyInitSinkFuzzTest") { sources = [ "sinkproxyinitsink_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkProxyInitSinkFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn index a3ddfb9e..782b4c1b 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkProxySubscribeLocalHardwareFuzzTest") { sources = [ "sinkproxysubscribelocalhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkProxySubscribeLocalHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn index 8c62abfd..dbf0384e 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkProxyUnsubscribeLocalHardwareFuzzTest") { sources = [ "sinkproxyunsubscribelocalhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkProxyUnsubscribeLocalHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn index 77ff30fa..20bcc0c4 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") { sources = [ "sourcehandlerconfigdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -49,6 +42,7 @@ ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerfinishstartsa_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerfinishstartsa_fuzzer/BUILD.gn index e9a9e9fe..fa27f6fa 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerfinishstartsa_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerfinishstartsa_fuzzer/BUILD.gn @@ -30,13 +30,6 @@ ohos_fuzztest("SourceHandlerFinishStartSAFuzzTest") { sources = [ "sourcehandlerfinishstartsa_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SourceHandlerFinishStartSAFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn index 77c81ad1..5032301d 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn @@ -30,13 +30,6 @@ ohos_fuzztest("SourceHandlerInitSourceFuzzTest") { sources = [ "sourcehandlerinitsource_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -48,6 +41,7 @@ ohos_fuzztest("SourceHandlerInitSourceFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn index 2b49400e..046b29c8 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn @@ -31,19 +31,10 @@ ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") { sources = [ "sourcehandlerregisterdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", "${innerkits_path}/native_cpp/test/include", - "${fwk_services_path}/distributedhardwarefwkservice/include", - "${fwk_services_path}/distributedhardwarefwkservice/include/componentmanager", ] deps = [ @@ -52,6 +43,7 @@ ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn index 8721723a..a18a1391 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn @@ -31,19 +31,10 @@ ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") { sources = [ "sourcehandlerunregisterdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", "${innerkits_path}/native_cpp/test/include", - "${fwk_services_path}/distributedhardwarefwkservice/include", - "${fwk_services_path}/distributedhardwarefwkservice/include/componentmanager", ] deps = [ @@ -52,6 +43,7 @@ ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyregresult_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyregresult_fuzzer/BUILD.gn index 81b0b92e..cf1e38e3 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyregresult_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyregresult_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SourceIpcCallbackOnNotifyRegResultFuzzTest") { sources = [ "sourceipccallbackonnotifyregresult_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -55,6 +48,7 @@ ohos_fuzztest("SourceIpcCallbackOnNotifyRegResultFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyunregresult_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyunregresult_fuzzer/BUILD.gn index 8934af8a..e377161f 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyunregresult_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceipccallbackonnotifyunregresult_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SourceIpcCallbackOnNotifyUnregResultFuzzTest") { sources = [ "sourceipccallbackonnotifyunregresult_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -55,6 +48,7 @@ ohos_fuzztest("SourceIpcCallbackOnNotifyUnregResultFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn index 9778413d..948acdc1 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SourceOnLoadSystemAbilityFailFuzzTest") { sources = [ "sourceonloadsystemabilityfail_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -55,6 +48,7 @@ ohos_fuzztest("SourceOnLoadSystemAbilityFailFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", ] } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn index dcddf784..690c83b6 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SourceOnLoadSystemAbilitySuccessFuzzTest") { sources = [ "sourceonloadsystemabilitysuccess_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -55,6 +48,7 @@ ohos_fuzztest("SourceOnLoadSystemAbilitySuccessFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyconfigdistributedhardware_fuzzer/BUILD.gn index 0436003d..899798da 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyconfigdistributedhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SourceProxyConfigDistributedHardwareFuzzTest") { sources = [ "sourceproxyconfigdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -55,6 +48,7 @@ ohos_fuzztest("SourceProxyConfigDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydaudionotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydaudionotify_fuzzer/BUILD.gn index c87d0d19..37ecb991 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydaudionotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydaudionotify_fuzzer/BUILD.gn @@ -30,13 +30,6 @@ ohos_fuzztest("SourceProxyDAudioNotifyFuzzTest") { sources = [ "sourceproxydaudionotify_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SourceProxyDAudioNotifyFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn index 2668c088..563b3697 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SourceProxyInitSourceFuzzTest") { sources = [ "sourceproxyinitsource_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -55,6 +48,7 @@ ohos_fuzztest("SourceProxyInitSourceFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn index b79ae416..ca01fa1b 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SourceProxyRegisterDistributedHardwareFuzzTest") { sources = [ "sourceproxyregisterdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -55,6 +48,7 @@ ohos_fuzztest("SourceProxyRegisterDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn index 01a80ccf..075f9300 100755 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SourceProxyUnregisterDistributedHardwareFuzzTest") { sources = [ "sourceproxyunregisterdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -55,6 +48,7 @@ ohos_fuzztest("SourceProxyUnregisterDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn index 3e4bc07a..ecbd5500 100755 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn @@ -20,11 +20,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include", - ] - - include_dirs += [ "./include", "${common_path}/include", "${interfaces_path}/inner_kits/native_cpp/audio_sink/include", @@ -43,14 +38,12 @@ ohos_unittest("AudioSinkTest") { configs = [ ":module_private_config" ] - deps = [ - "${distributedaudio_path}/interfaces/inner_kits/native_cpp/audio_sink:distributed_audio_sink_sdk", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = [ "${distributedaudio_path}/interfaces/inner_kits/native_cpp/audio_sink:distributed_audio_sink_sdk" ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", + "googletest:gmock", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn index 0c1d9cd7..c9eae86f 100755 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn @@ -20,13 +20,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", - "${fwk_common_path}/log/include", - ] - - include_dirs += [ "./include", "${common_path}/include", "${interfaces_path}/inner_kits/native_cpp/audio_source/include", @@ -49,14 +42,12 @@ ohos_unittest("AudioSourceTest") { configs = [ ":module_private_config" ] - deps = [ - "${interfaces_path}/inner_kits/native_cpp/audio_source:distributed_audio_source_sdk", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = [ "${interfaces_path}/inner_kits/native_cpp/audio_source:distributed_audio_source_sdk" ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", + "googletest:gmock", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audioclient/test/unittest/micclient/BUILD.gn b/services/audioclient/test/unittest/micclient/BUILD.gn index 3c488189..eefb95b0 100644 --- a/services/audioclient/test/unittest/micclient/BUILD.gn +++ b/services/audioclient/test/unittest/micclient/BUILD.gn @@ -21,9 +21,7 @@ module_out_path = "distributed_audio/services/audioclient/mic_client_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ "${mediastandardfwk_path}/audiocommon/include" ] - - include_dirs += [ + include_dirs = [ "${audio_client_path}/interface", "${audio_client_path}/micclient/include", "${audio_client_path}/test/unittest/micclient/include", @@ -33,7 +31,6 @@ config("module_private_config") { "${audio_transport_path}/receiverengine/include", "${audio_transport_path}/senderengine/include", "${common_path}/include", - "${fwk_common_path}/utils/include", "${services_path}/common/audioeventcallback", "${services_path}/common/audiodata/include", "${services_path}/common/audioparam", @@ -50,17 +47,17 @@ ohos_unittest("MicClientTest") { configs = [ ":module_private_config" ] - deps = [ - "${services_path}/audiomanager/servicesink:distributed_audio_sink", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = [ "${services_path}/audiomanager/servicesink:distributed_audio_sink" ] external_deps = [ "audio_framework:audio_capturer", + "audio_framework:audio_client", + "audio_framework:audio_renderer", "cJSON:cjson", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "googletest:gmock", ] } diff --git a/services/audioclient/test/unittest/spkclient/BUILD.gn b/services/audioclient/test/unittest/spkclient/BUILD.gn index a5d99386..8c506328 100644 --- a/services/audioclient/test/unittest/spkclient/BUILD.gn +++ b/services/audioclient/test/unittest/spkclient/BUILD.gn @@ -22,12 +22,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiomanager/include", - "${mediastandardfwk_path}/audiorenderer/include", - ] - - include_dirs += [ "${audio_client_path}/interface", "${audio_client_path}/spkclient/include", "${audio_client_path}/test/unittest/spkclient/include", @@ -37,7 +31,6 @@ config("module_private_config") { "${audio_transport_path}/receiverengine/include", "${audio_transport_path}/senderengine/include", "${common_path}/include", - "${fwk_common_path}/utils/include", "${services_path}/common/audioeventcallback", "${services_path}/common/audiodata/include", "${services_path}/common/audioparam", @@ -57,15 +50,17 @@ ohos_unittest("SpeakerClientTest") { deps = [ "${services_path}/audiomanager/servicesink:distributed_audio_sink", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ + "audio_framework:audio_capturer", "audio_framework:audio_client", + "audio_framework:audio_renderer", "cJSON:cjson", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "googletest:gmock", ] } diff --git a/services/audiocontrol/test/unittest/controlsink/BUILD.gn b/services/audiocontrol/test/unittest/controlsink/BUILD.gn index d8f272d1..76fba4a4 100644 --- a/services/audiocontrol/test/unittest/controlsink/BUILD.gn +++ b/services/audiocontrol/test/unittest/controlsink/BUILD.gn @@ -19,9 +19,7 @@ module_out_path = "distributed_audio/services/audiocontrol/control_sink_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${services_path}/common/audiodata/include", @@ -43,13 +41,13 @@ ohos_unittest("ControlSinkTest") { configs = [ ":module_private_config" ] - deps = [ - "${services_path}/audiomanager/servicesink:distributed_audio_sink", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = [ "${services_path}/audiomanager/servicesink:distributed_audio_sink" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", + "googletest:gmock", + ] } group("control_sink_test") { diff --git a/services/audiocontrol/test/unittest/controlsource/BUILD.gn b/services/audiocontrol/test/unittest/controlsource/BUILD.gn index 4bdab184..ad6bb964 100644 --- a/services/audiocontrol/test/unittest/controlsource/BUILD.gn +++ b/services/audiocontrol/test/unittest/controlsource/BUILD.gn @@ -19,9 +19,7 @@ module_out_path = "distributed_audio/services/audiocontrol/control_source_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${services_path}/common/audioparam", @@ -41,17 +39,16 @@ ohos_unittest("ControlSourceTest") { configs = [ ":module_private_config" ] - deps = [ - "${services_path}/audiomanager/servicesource:distributed_audio_source", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = + [ "${services_path}/audiomanager/servicesource:distributed_audio_source" ] external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libnativetoken_shared", "access_token:libtokensetproc_shared", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", + "googletest:gmock", ] } diff --git a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn index 435689f4..c04d0cdb 100644 --- a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn +++ b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn @@ -21,9 +21,7 @@ module_out_path = "distributed_audio/services/audiohdiproxy/daudio_hdi_handler" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${services_path}/common/audiodata/include", @@ -41,15 +39,14 @@ ohos_unittest("DAudioHdiHandlerTest") { configs = [ ":module_private_config" ] - deps = [ - "${services_path}/audiomanager/servicesource:distributed_audio_source", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = + [ "${services_path}/audiomanager/servicesource:distributed_audio_source" ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "googletest:gmock", "ipc:ipc_core", ] } diff --git a/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn b/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn index 8ab6898a..c29d047a 100644 --- a/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn +++ b/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn @@ -22,9 +22,7 @@ module_out_path = config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ "${fwk_common_path}/utils/include" ] - - include_dirs += [ + include_dirs = [ "include", "${common_path}/include", "${audio_hdi_proxy_path}/include", @@ -45,13 +43,13 @@ ohos_unittest("DAudioManagerCallbackTest") { deps = [ "${services_path}/audiomanager/servicesource:distributed_audio_source", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "googletest:gmock", "ipc:ipc_core", ] } diff --git a/services/audiomanager/test/fuzztest/sinkservicedaudionotify_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicedaudionotify_fuzzer/BUILD.gn index afbe42c8..4f0d2e21 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedaudionotify_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicedaudionotify_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkServiceDAudioNotifyFuzzTest") { sources = [ "sinkservicedaudionotify_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkServiceDAudioNotifyFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/fuzztest/sinkserviceinitsink_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkserviceinitsink_fuzzer/BUILD.gn index deabbf84..5d15d5f9 100644 --- a/services/audiomanager/test/fuzztest/sinkserviceinitsink_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkserviceinitsink_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkServiceInitSinkFuzzTest") { sources = [ "sinkserviceinitsink_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -57,6 +50,7 @@ ohos_fuzztest("SinkServiceInitSinkFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/fuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn index fc5c105d..872458c6 100644 --- a/services/audiomanager/test/fuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkServicePauseDistributedHardwareFuzzTest") { sources = [ "sinkservicepausedistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkServicePauseDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/fuzztest/sinkservicereleasesink_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicereleasesink_fuzzer/BUILD.gn index 15f0f525..683f3806 100644 --- a/services/audiomanager/test/fuzztest/sinkservicereleasesink_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicereleasesink_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkServiceReleaseSinkFuzzTest") { sources = [ "sinkservicereleasesink_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkServiceReleaseSinkFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/fuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn index 9f52119d..7ec7bf5d 100644 --- a/services/audiomanager/test/fuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn @@ -30,13 +30,6 @@ ohos_fuzztest("SinkServiceResumeDistributedHardwareFuzzTest") { sources = [ "sinkserviceresumedistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -53,6 +46,7 @@ ohos_fuzztest("SinkServiceResumeDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/fuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn index e3f16e82..8daeaef9 100644 --- a/services/audiomanager/test/fuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkServiceStopDistributedHardwareFuzzTest") { sources = [ "sinkservicestopdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkServiceStopDistributedHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/fuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn index 891dc4fd..9a3c8a9a 100644 --- a/services/audiomanager/test/fuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkServiceSubscribeLocalHardwareFuzzTest") { sources = [ "sinkservicesubscribelocalhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkServiceSubscribeLocalHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/fuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn index d2915a3c..1c162ad6 100644 --- a/services/audiomanager/test/fuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn @@ -31,13 +31,6 @@ ohos_fuzztest("SinkServiceUnSubscribeLocalHardwareFuzzTest") { sources = [ "sinkserviceunsubscribelocalhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -54,6 +47,7 @@ ohos_fuzztest("SinkServiceUnSubscribeLocalHardwareFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/fuzztest/sinkstubdaudiosinkstub_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkstubdaudiosinkstub_fuzzer/BUILD.gn index 1f2357f5..7e6bf945 100644 --- a/services/audiomanager/test/fuzztest/sinkstubdaudiosinkstub_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkstubdaudiosinkstub_fuzzer/BUILD.gn @@ -33,13 +33,6 @@ ohos_fuzztest("SinkStubDaudioSinkStubFuzzTest") { sources = [ "sinkstubdaudiosinkstub_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -56,6 +49,7 @@ ohos_fuzztest("SinkStubDaudioSinkStubFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/fuzztest/sinkstubonremoterequest_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkstubonremoterequest_fuzzer/BUILD.gn index 3963021c..dd60e266 100644 --- a/services/audiomanager/test/fuzztest/sinkstubonremoterequest_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkstubonremoterequest_fuzzer/BUILD.gn @@ -33,13 +33,6 @@ ohos_fuzztest("SinkStubOnRemoteRequestFuzzTest") { sources = [ "sinkstubonremoterequest_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", @@ -56,6 +49,7 @@ ohos_fuzztest("SinkStubOnRemoteRequestFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn index fbe97d25..99fd8554 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn @@ -30,17 +30,6 @@ ohos_fuzztest("SourceServiceConfigDistributedHardwareFuzzTest") { sources = [ "sourceserviceconfigdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${driver_audio_path}/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiomanager/include", - "${mediastandardfwk_path}/audiocommon/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${common_path}/dfx_utils/include", @@ -60,9 +49,12 @@ ohos_fuzztest("SourceServiceConfigDistributedHardwareFuzzTest") { ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn index 5ccb792f..b9723e07 100644 --- a/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn @@ -31,17 +31,6 @@ ohos_fuzztest("SourceServiceDAudioNotifyFuzzTest") { sources = [ "sourceservicedaudionotify_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${driver_audio_path}/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiomanager/include", - "${mediastandardfwk_path}/audiocommon/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${common_path}/dfx_utils/include", @@ -61,9 +50,12 @@ ohos_fuzztest("SourceServiceDAudioNotifyFuzzTest") { ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn index a11e0bae..3159bb8d 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn @@ -31,17 +31,6 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { sources = [ "sourceserviceinitsource_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${driver_audio_path}/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiomanager/include", - "${mediastandardfwk_path}/audiocommon/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${common_path}/dfx_utils/include", @@ -63,9 +52,12 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn index 9885f135..334c1a7d 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn @@ -30,17 +30,6 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { sources = [ "sourceserviceregisterdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${driver_audio_path}/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiomanager/include", - "${mediastandardfwk_path}/audiocommon/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${common_path}/dfx_utils/include", @@ -60,9 +49,12 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn index 87faef22..12a50c75 100644 --- a/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn @@ -31,17 +31,6 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { sources = [ "sourceservicereleasesource_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${driver_audio_path}/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiomanager/include", - "${mediastandardfwk_path}/audiocommon/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${common_path}/dfx_utils/include", @@ -61,9 +50,12 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn index e506205b..fa3b4f86 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn @@ -30,17 +30,6 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { sources = [ "sourceserviceunregisterdistributedhardware_fuzzer.cpp" ] include_dirs = [ - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${driver_audio_path}/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiomanager/include", - "${mediastandardfwk_path}/audiocommon/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${common_path}/dfx_utils/include", @@ -60,9 +49,12 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/unittest/managersink/BUILD.gn b/services/audiomanager/test/unittest/managersink/BUILD.gn index 8bacf59b..2e90a403 100644 --- a/services/audiomanager/test/unittest/managersink/BUILD.gn +++ b/services/audiomanager/test/unittest/managersink/BUILD.gn @@ -22,15 +22,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${audio_framework_path}/audiopolicy/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", - "${mediastandardfwk_path}/audiomanager/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "${audio_client_path}/micclient/include", "${audio_client_path}/spkclient/include", "${audio_client_path}/interface", @@ -64,8 +55,6 @@ ohos_unittest("DaudioSinkDevTest") { "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk", "${services_path}/audiomanager/servicesink:distributed_audio_sink", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -78,7 +67,9 @@ ohos_unittest("DaudioSinkDevTest") { "device_security_level:dslm_sdk", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", + "googletest:gmock", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", "hdf_core:libhdi", @@ -101,8 +92,6 @@ ohos_unittest("DAudioSinkManagerTest") { deps = [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk", "${services_path}/audiomanager/servicesink:distributed_audio_sink", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -115,6 +104,8 @@ ohos_unittest("DAudioSinkManagerTest") { "device_security_level:dslm_sdk", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "googletest:gmock", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", "hdf_core:libhdi", diff --git a/services/audiomanager/test/unittest/servicesink/BUILD.gn b/services/audiomanager/test/unittest/servicesink/BUILD.gn index 80186d8f..7396b13d 100644 --- a/services/audiomanager/test/unittest/servicesink/BUILD.gn +++ b/services/audiomanager/test/unittest/servicesink/BUILD.gn @@ -22,15 +22,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${audio_framework_path}/audiopolicy/include", - "${fwk_common_path}/utils/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", - "${mediastandardfwk_path}/audiomanager/include", - ] - - include_dirs += [ "${audio_client_path}/micclient/include", "${audio_client_path}/spkclient/include", "${audio_control_path}/controlsink/include", @@ -59,18 +50,16 @@ ohos_unittest("DaudioSinkServiceTest") { configs = [ ":module_private_config" ] - deps = [ - "${services_path}/audiomanager/servicesink:distributed_audio_sink", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = [ "${services_path}/audiomanager/servicesink:distributed_audio_sink" ] external_deps = [ "audio_framework:audio_capturer", "audio_framework:audio_client", "audio_framework:audio_renderer", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", + "googletest:gmock", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", @@ -96,11 +85,7 @@ ohos_unittest("DaudioSinkStubTest") { configs = [ ":module_private_config" ] - deps = [ - "${services_path}/audiomanager/servicesink:distributed_audio_sink", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = [ "${services_path}/audiomanager/servicesink:distributed_audio_sink" ] external_deps = [ "access_token:libaccesstoken_sdk", @@ -109,7 +94,9 @@ ohos_unittest("DaudioSinkStubTest") { "audio_framework:audio_client", "audio_framework:audio_renderer", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", + "googletest:gmock", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/services/audiomanager/test/unittest/servicesource/BUILD.gn b/services/audiomanager/test/unittest/servicesource/BUILD.gn index cfc41918..568dbaa6 100644 --- a/services/audiomanager/test/unittest/servicesource/BUILD.gn +++ b/services/audiomanager/test/unittest/servicesource/BUILD.gn @@ -22,16 +22,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${audio_framework_path}/audiopolicy/include", - "${driver_audio_path}/include", - "${fwk_common_path}/utils/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", - "${mediastandardfwk_path}/audiomanager/include", - ] - - include_dirs += [ "${audio_control_path}/controlsource/include", "${audio_hdi_proxy_path}/include", "${audio_processor_path}/interface", @@ -41,7 +31,6 @@ config("module_private_config") { "${common_path}/include", "${common_path}/dfx_utils/include", "${distributedaudio_path}/audiohandler/include", - "${hdf_service_path}/hdi_service/common/include", "${innerkits_path}/native_cpp/audio_sink/include", "${innerkits_path}/native_cpp/audio_source/include", "${interfaces_path}/inner_kits/native_cpp/audio_sink/include", @@ -67,11 +56,8 @@ ohos_unittest("DaudioSourceServiceTest") { configs = [ ":module_private_config" ] - deps = [ - "${services_path}/audiomanager/servicesource:distributed_audio_source", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = + [ "${services_path}/audiomanager/servicesource:distributed_audio_source" ] external_deps = [ "audio_framework:audio_capturer", @@ -79,8 +65,10 @@ ohos_unittest("DaudioSourceServiceTest") { "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", "dsoftbus:softbus_client", + "googletest:gmock", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", @@ -106,11 +94,8 @@ ohos_unittest("DaudioSourceStubTest") { configs = [ ":module_private_config" ] - deps = [ - "${services_path}/audiomanager/servicesource:distributed_audio_source", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = + [ "${services_path}/audiomanager/servicesource:distributed_audio_source" ] external_deps = [ "access_token:libaccesstoken_sdk", @@ -120,8 +105,10 @@ ohos_unittest("DaudioSourceStubTest") { "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", "dsoftbus:softbus_client", + "googletest:gmock", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn index 9300602b..0542a837 100644 --- a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn @@ -20,14 +20,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${driver_audio_path}/include", - "${fwk_common_path}/utils/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiomanager/include", - ] - - include_dirs += [ "include", "${audio_control_path}/controlsource/include", "${audio_hdi_proxy_path}/include", @@ -38,7 +30,6 @@ config("module_private_config") { "${common_path}/include", "${common_path}/dfx_utils/include", "${distributedaudio_path}/audiohandler/include", - "${hdf_service_path}/hdi_service/common/include", "${innerkits_path}/native_cpp/audio_source/include", "${innerkits_path}/native_cpp/audio_sink/include", "${interfaces_path}/inner_kits/native_cpp/audio_sink/include", @@ -74,18 +65,21 @@ ohos_unittest("DaudioSourceDevTest") { "${audio_transport_path}/senderengine:distributed_audio_encode_transport", "${services_path}/audiomanager/servicesource:distributed_audio_source", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", + "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "googletest:gmock", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", @@ -112,15 +106,17 @@ ohos_unittest("DMicDevTest") { "${audio_transport_path}/receiverengine:distributed_audio_decode_transport", "${services_path}/audiomanager/servicesource:distributed_audio_source", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", + "audio_framework:audio_renderer", "cJSON:cjson", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "googletest:gmock", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", @@ -147,16 +143,18 @@ ohos_unittest("DSpeakerDevTest") { "${audio_transport_path}/senderengine:distributed_audio_encode_transport", "${services_path}/audiomanager/servicesource:distributed_audio_source", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", + "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "googletest:gmock", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", @@ -187,11 +185,12 @@ ohos_unittest("DAudioEchoCannelManagerTest") { "${audio_transport_path}/senderengine:distributed_audio_encode_transport", "${services_path}/audiomanager/servicesource:distributed_audio_source", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", + "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", @@ -199,6 +198,7 @@ ohos_unittest("DAudioEchoCannelManagerTest") { "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "googletest:gmock", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", diff --git a/services/audiomanager/test/unittest/sourcemanager/BUILD.gn b/services/audiomanager/test/unittest/sourcemanager/BUILD.gn index e2fa7e5d..7f32080a 100644 --- a/services/audiomanager/test/unittest/sourcemanager/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcemanager/BUILD.gn @@ -20,14 +20,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${driver_audio_path}/include", - "${fwk_common_path}/utils/include", - "${mediastandardfwk_path}/audiocapturer/include", - "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiomanager/include", - ] - - include_dirs += [ "include", "${audio_control_path}/controlsource/include", "${audio_hdi_proxy_path}/include", @@ -41,7 +33,6 @@ config("module_private_config") { "${common_path}/include", "${common_path}/dfx_utils/include", "${distributedaudio_path}/audiohandler/include", - "${hdf_service_path}/hdi_service/common/include", "${interfaces_path}/inner_kits/native_cpp/audio_sink/include", "${interfaces_path}/inner_kits/native_cpp/audio_source/include", "${innerkits_path}/native_cpp/audio_source/include", @@ -67,18 +58,21 @@ ohos_unittest("DaudioSourceMgrTest") { "${innerkits_path}/native_cpp/audio_source:distributed_audio_source_sdk", "${services_path}/audiomanager/servicesource:distributed_audio_source", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", + "audio_framework:audio_renderer", "cJSON:cjson", "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "googletest:gmock", "hdf_core:libhdi", "ipc:ipc_core", "ipc:ipc_single", diff --git a/services/audioprocessor/test/unittest/common/directprocessor/BUILD.gn b/services/audioprocessor/test/unittest/common/directprocessor/BUILD.gn index b0c396a3..91ecaea2 100644 --- a/services/audioprocessor/test/unittest/common/directprocessor/BUILD.gn +++ b/services/audioprocessor/test/unittest/common/directprocessor/BUILD.gn @@ -23,12 +23,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${mediastandard_path}/interfaces/innerkits/native/media/include", - "${mediastandardfwk_path}/audiocommon/include", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ "${common_path}/include", "${services_path}/common/audioparam", "${services_path}/common/audiodata/include", @@ -47,11 +41,14 @@ ohos_unittest("DirectProcessorTest") { deps = [ "${audio_transport_path}/receiverengine:distributed_audio_decode_transport", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gtest_main", ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", + "audio_framework:audio_renderer", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "player_framework:media_client", ] diff --git a/services/audiotransport/test/unittest/receiverengine/BUILD.gn b/services/audiotransport/test/unittest/receiverengine/BUILD.gn index 756eeaee..f5494019 100644 --- a/services/audiotransport/test/unittest/receiverengine/BUILD.gn +++ b/services/audiotransport/test/unittest/receiverengine/BUILD.gn @@ -21,11 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${mediastandard_path}/interfaces/innerkits/native/media/include", - "${mediastandardfwk_path}/audiocommon/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${common_path}/dfx_utils/include", @@ -51,14 +46,16 @@ ohos_unittest("AVTransReceiverAdapterTest") { deps = [ "${audio_transport_path}/receiverengine:distributed_audio_decode_transport", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", + "audio_framework:audio_renderer", "cJSON:cjson", "distributed_hardware_fwk:distributed_av_receiver", "dsoftbus:softbus_client", + "googletest:gmock", ] } diff --git a/services/audiotransport/test/unittest/receiverengine/engineutils/include/engine_test_utils.h b/services/audiotransport/test/unittest/receiverengine/engineutils/include/engine_test_utils.h index 781ef403..a72d6c5c 100644 --- a/services/audiotransport/test/unittest/receiverengine/engineutils/include/engine_test_utils.h +++ b/services/audiotransport/test/unittest/receiverengine/engineutils/include/engine_test_utils.h @@ -105,7 +105,7 @@ public: return 0; } - int32_t RegisterReceiverCallback(const std::shared_ptr &callback) + int32_t RegisterReceiverCallback(const std::shared_ptr &callback) override { (void) callback; return 0; @@ -177,7 +177,7 @@ public: return 0; } - int32_t RegisterSenderCallback(const std::shared_ptr &callback) + int32_t RegisterSenderCallback(const std::shared_ptr &callback) override { (void) callback; return 0; @@ -249,7 +249,7 @@ public: return 1; } - int32_t RegisterSenderCallback(const std::shared_ptr &callback) + int32_t RegisterSenderCallback(const std::shared_ptr &callback) override { (void) callback; return 0; diff --git a/services/audiotransport/test/unittest/senderengine/BUILD.gn b/services/audiotransport/test/unittest/senderengine/BUILD.gn index 6351564e..c262132d 100644 --- a/services/audiotransport/test/unittest/senderengine/BUILD.gn +++ b/services/audiotransport/test/unittest/senderengine/BUILD.gn @@ -20,11 +20,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${mediastandard_path}/interfaces/innerkits/native/media/include", - "${mediastandardfwk_path}/audiocommon/include", - ] - - include_dirs += [ "include", "${common_path}/include", "${common_path}/dfx_utils/include", @@ -50,14 +45,16 @@ ohos_unittest("AVTransSenderAdapterTest") { deps = [ "${audio_transport_path}/senderengine:distributed_audio_encode_transport", "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ + "audio_framework:audio_capturer", + "audio_framework:audio_client", + "audio_framework:audio_renderer", "cJSON:cjson", "distributed_hardware_fwk:distributed_av_sender", "dsoftbus:softbus_client", + "googletest:gmock", ] } diff --git a/services/common/test/unittest/audiodata/BUILD.gn b/services/common/test/unittest/audiodata/BUILD.gn index 4ade4027..b51ce065 100644 --- a/services/common/test/unittest/audiodata/BUILD.gn +++ b/services/common/test/unittest/audiodata/BUILD.gn @@ -34,15 +34,12 @@ ohos_unittest("AudioDataTest") { configs = [ ":module_private_config" ] - deps = [ - "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = [ "${services_path}/common:distributed_audio_utils" ] external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "googletest:gmock", ] } -- Gitee