From ac01e0af0fa8faa3900374cb9a43450ace46ccf0 Mon Sep 17 00:00:00 2001 From: vv Date: Tue, 30 Jul 2024 17:12:13 +0800 Subject: [PATCH 01/12] =?UTF-8?q?dlopen=E4=BC=A0=E5=8F=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: vv --- .../managersink/src/daudio_sink_manager.cpp | 17 ++++------------- .../src/daudio_echo_cannel_manager.cpp | 11 ++--------- .../managersource/src/daudio_source_manager.cpp | 17 ++++------------- 3 files changed, 10 insertions(+), 35 deletions(-) diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index 497467aa..aef501e8 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -42,11 +42,6 @@ const std::string SENDER_SO_NAME = "libdistributed_av_sender.z.so"; const std::string GET_SENDER_PROVIDER_FUNC = "GetAVSenderEngineProvider"; const std::string RECEIVER_SO_NAME = "libdistributed_av_receiver.z.so"; const std::string GET_RECEIVER_PROVIDER_FUNC = "GetAVReceiverEngineProvider"; -#ifdef __LP64__ -const std::string LIB_LOAD_PATH = "/system/lib64/"; -#else -const std::string LIB_LOAD_PATH = "/system/lib/"; -#endif DAudioSinkManager::DAudioSinkManager() { DHLOGD("Distributed audio sink manager constructed."); @@ -304,13 +299,11 @@ void DAudioSinkManager::ClearAudioDev(const std::string &devId) int32_t DAudioSinkManager::LoadAVReceiverEngineProvider() { DHLOGI("LoadAVReceiverEngineProvider enter"); - char path[PATH_MAX + 1] = {0x00}; - if ((LIB_LOAD_PATH.length() + RECEIVER_SO_NAME.length()) > PATH_MAX || - realpath((LIB_LOAD_PATH + RECEIVER_SO_NAME).c_str(), path) == nullptr) { + if (RECEIVER_SO_NAME.length() > PATH_MAX) { DHLOGE("File open failed"); return ERR_DH_AUDIO_NULLPTR; } - pRHandler_ = dlopen(path, RTLD_LAZY | RTLD_NODELETE); + pRHandler_ = dlopen(RECEIVER_SO_NAME.c_str(), RTLD_LAZY | RTLD_NODELETE); CHECK_NULL_RETURN(pRHandler_, ERR_DH_AUDIO_NULLPTR); AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pRHandler_, @@ -339,13 +332,11 @@ int32_t DAudioSinkManager::UnloadAVReceiverEngineProvider() int32_t DAudioSinkManager::LoadAVSenderEngineProvider() { DHLOGI("LoadAVSenderEngineProvider enter"); - char path[PATH_MAX + 1] = {0x00}; - if ((LIB_LOAD_PATH.length() + SENDER_SO_NAME.length()) > PATH_MAX || - realpath((LIB_LOAD_PATH + SENDER_SO_NAME).c_str(), path) == nullptr) { + if (SENDER_SO_NAME.length() > PATH_MAX) { DHLOGE("File open failed"); return ERR_DH_AUDIO_NULLPTR; } - pSHandler_ = dlopen(path, RTLD_LAZY | RTLD_NODELETE); + pSHandler_ = dlopen(SENDER_SO_NAME.c_str(), RTLD_LAZY | RTLD_NODELETE); CHECK_NULL_RETURN(pSHandler_, ERR_DH_AUDIO_NULLPTR); AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pSHandler_, diff --git a/services/audiomanager/managersource/src/daudio_echo_cannel_manager.cpp b/services/audiomanager/managersource/src/daudio_echo_cannel_manager.cpp index ee0213cc..400809d0 100644 --- a/services/audiomanager/managersource/src/daudio_echo_cannel_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_echo_cannel_manager.cpp @@ -35,11 +35,6 @@ using AecEffectProcessorProvider = AecEffector *(*)(); const std::string ECHOCANNEL_SO_NAME = "libdaudio_aec_effect_processor.z.so"; const std::string GET_AEC_EFFECT_PROCESSOR_FUNC = "GetAecEffector"; const int32_t FRAME_SIZE_NORMAL = 3840; -#ifdef __LP64__ -const std::string LIB_LOAD_PATH = "/system/lib64/"; -#else -const std::string LIB_LOAD_PATH = "/system/lib/"; -#endif DAudioEchoCannelManager::DAudioEchoCannelManager() { @@ -307,13 +302,11 @@ int32_t DAudioEchoCannelManager::AudioCaptureRelease() int32_t DAudioEchoCannelManager::LoadAecProcessor() { DHLOGI("LoadAecEffectProcessor enter"); - char path[PATH_MAX + 1] = {0x00}; - if ((LIB_LOAD_PATH.length() + ECHOCANNEL_SO_NAME.length()) > PATH_MAX || - realpath((LIB_LOAD_PATH+ ECHOCANNEL_SO_NAME).c_str(), path) == nullptr) { + if (ECHOCANNEL_SO_NAME.length() > PATH_MAX) { DHLOGE("File open failed"); return ERR_DH_AUDIO_NULLPTR; } - aecHandler_ = dlopen(path, RTLD_LAZY | RTLD_NODELETE); + aecHandler_ = dlopen(ECHOCANNEL_SO_NAME.c_str(), RTLD_LAZY | RTLD_NODELETE); CHECK_AND_RETURN_RET_LOG(aecHandler_ == nullptr, ERR_DH_AUDIO_NULLPTR, "dlOpen error."); AecEffectProcessorProvider getAecEffectProcessorFunc = (AecEffectProcessorProvider)dlsym(aecHandler_, GET_AEC_EFFECT_PROCESSOR_FUNC.c_str()); diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index 9dcb012c..45325d1e 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -43,11 +43,6 @@ const std::string SENDER_SO_NAME = "libdistributed_av_sender.z.so"; const std::string GET_SENDER_PROVIDER_FUNC = "GetAVSenderEngineProvider"; const std::string RECEIVER_SO_NAME = "libdistributed_av_receiver.z.so"; const std::string GET_RECEIVER_PROVIDER_FUNC = "GetAVReceiverEngineProvider"; -#ifdef __LP64__ -const std::string LIB_LOAD_PATH = "/system/lib64/"; -#else -const std::string LIB_LOAD_PATH = "/system/lib/"; -#endif DAudioSourceManager::DAudioSourceManager() { @@ -503,13 +498,11 @@ void DAudioSourceManager::ListenAudioDev() int32_t DAudioSourceManager::LoadAVSenderEngineProvider() { DHLOGI("LoadAVSenderEngineProvider enter"); - char path[PATH_MAX + 1] = {0x00}; - if ((LIB_LOAD_PATH.length() + SENDER_SO_NAME.length()) > PATH_MAX || - realpath((LIB_LOAD_PATH + SENDER_SO_NAME).c_str(), path) == nullptr) { + if (SENDER_SO_NAME.length() > PATH_MAX) { DHLOGE("File open failed"); return ERR_DH_AUDIO_NULLPTR; } - pSHandler_ = dlopen(path, RTLD_LAZY | RTLD_NODELETE); + pSHandler_ = dlopen(SENDER_SO_NAME.c_str(), RTLD_LAZY | RTLD_NODELETE); CHECK_NULL_RETURN(pSHandler_, ERR_DH_AUDIO_NULLPTR); AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pSHandler_, GET_SENDER_PROVIDER_FUNC.c_str()); @@ -538,13 +531,11 @@ int32_t DAudioSourceManager::UnloadAVSenderEngineProvider() int32_t DAudioSourceManager::LoadAVReceiverEngineProvider() { DHLOGI("LoadAVReceiverEngineProvider enter"); - char path[PATH_MAX + 1] = {0x00}; - if ((LIB_LOAD_PATH.length() + RECEIVER_SO_NAME.length()) > PATH_MAX || - realpath((LIB_LOAD_PATH + RECEIVER_SO_NAME).c_str(), path) == nullptr) { + if (RECEIVER_SO_NAME.length() > PATH_MAX) { DHLOGE("File canonicalization failed"); return ERR_DH_AUDIO_NULLPTR; } - pRHandler_ = dlopen(path, RTLD_LAZY | RTLD_NODELETE); + pRHandler_ = dlopen(RECEIVER_SO_NAME.c_str(), RTLD_LAZY | RTLD_NODELETE); CHECK_NULL_RETURN(pRHandler_, ERR_DH_AUDIO_NULLPTR); AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pRHandler_, GET_RECEIVER_PROVIDER_FUNC.c_str()); -- Gitee From abd5617bd72a8c98d1519df034245044a3612e54 Mon Sep 17 00:00:00 2001 From: zhonglufu Date: Wed, 7 Aug 2024 10:28:18 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E9=9F=B3=E9=A2=91=E4=BF=AE=E6=94=B9coody?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhonglufu --- .../receiverengine/src/av_receiver_engine_transport.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp b/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp index 6849ae29..f5ab6aa1 100644 --- a/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp +++ b/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp @@ -129,6 +129,7 @@ void AVTransReceiverTransport::OnEngineDataAvailable(const std::shared_ptrGetBufferData(0); + CHECK_NULL_VOID(bufferData); std::shared_ptr audioData = std::make_shared(bufferData->GetSize()); int32_t ret = memcpy_s(audioData->Data(), audioData->Capacity(), bufferData->GetAddress(), bufferData->GetSize()); if (ret != EOK) { -- Gitee From c4309418262568645190d7ec4b35d6791d50e93a Mon Sep 17 00:00:00 2001 From: zhonglufu Date: Fri, 9 Aug 2024 09:38:55 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91UT=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhonglufu --- .../include/audio_manager_test_utils.h | 57 +++++++++++++++ .../sourcedevice/src/dmic_dev_test.cpp | 71 ++++++++++++++++++- 2 files changed, 127 insertions(+), 1 deletion(-) diff --git a/services/audiomanager/test/unittest/audiomanagertestutils/include/audio_manager_test_utils.h b/services/audiomanager/test/unittest/audiomanagertestutils/include/audio_manager_test_utils.h index 57e92358..5e1b4687 100644 --- a/services/audiomanager/test/unittest/audiomanagertestutils/include/audio_manager_test_utils.h +++ b/services/audiomanager/test/unittest/audiomanagertestutils/include/audio_manager_test_utils.h @@ -89,6 +89,63 @@ public: return 0; } }; + +class MockIAudioDataTransportInner : public IAudioDataTransport { +public: + MockIAudioDataTransportInner() = default; + ~MockIAudioDataTransportInner() = default; + + int32_t SetUp(const AudioParam &localParam, const AudioParam &remoteParam, + const std::shared_ptr &callback, const PortCapType capType) override + { + return ERR_DH_AUDIO_FAILED; + } + + int32_t Start() override + { + return ERR_DH_AUDIO_FAILED; + } + + int32_t Stop() override + { + return ERR_DH_AUDIO_FAILED; + } + + int32_t Release() override + { + return ERR_DH_AUDIO_FAILED; + } + + int32_t Pause() override + { + return ERR_DH_AUDIO_FAILED; + } + + int32_t Restart(const AudioParam &localParam, const AudioParam &remoteParam) override + { + return ERR_DH_AUDIO_FAILED; + } + + int32_t FeedAudioData(std::shared_ptr &audioData) override + { + return ERR_DH_AUDIO_FAILED; + } + + int32_t InitEngine(IAVEngineProvider *providerPtr) override + { + return ERR_DH_AUDIO_FAILED; + } + + int32_t SendMessage(uint32_t type, std::string content, std::string dstDevId) override + { + return ERR_DH_AUDIO_FAILED; + } + + int32_t CreateCtrl() override + { + return ERR_DH_AUDIO_FAILED; + } +}; } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_AUDIO_MANAGER_TEST_UTILS diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index 7e157abb..6a5e13e8 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -58,7 +58,17 @@ HWTEST_F(DMicDevTest, InitReceiverEngine_001, TestSize.Level1) mic_->OnEngineTransDataAvailable(audioData); EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->InitReceiverEngine(providerPtr)); mic_->micTrans_ = std::make_shared(); - EXPECT_EQ(DH_SUCCESS, mic_->InitReceiverEngine(providerPtr)); + EXPECT_EQ(DH_SUCCESS, mic_->InitReceiverEngine(providerPtr));. + + AVTransEvent event = { EventType::EVENT_STOP_SUCCESS, "", "" }; + mic_->OnEngineTransEvent(event); + + mic_->echoCannelOn_ = true; + mic_->echoManager_ = nullptr; + mic_->OnEngineTransDataAvailable(audioData); + + mic_->echoManager_ = std::make_shared(); + mic_->OnEngineTransDataAvailable(audioData); } /** @@ -162,6 +172,22 @@ HWTEST_F(DMicDevTest, NotifyEvent_001, TestSize.Level1) event.type = EVENT_UNKNOWN; EXPECT_EQ(DH_SUCCESS, mic_->NotifyEvent(streamId_, event)); + mic_->isTransReady_ = false; + event.type = AUDIO_START; + EXPECT_EQ(DH_SUCCESS, mic_->NotifyEvent(streamId_, event)); + + event.type = AUDIO_STOP; + EXPECT_EQ(DH_SUCCESS, mic_->NotifyEvent(streamId_, event)); + + mic_->isTransReady_ = true; + for (int32_t i = 0; i < NOTIFY_WAIT_FRAMES; i++) { + size_t size = 4096; + auto audioData = std::make_shared(size); + mic_->dataQueue_.push(audioData); + } + event.type = AUDIO_START; + EXPECT_EQ(DH_SUCCESS, mic_->NotifyEvent(streamId_, event)); + eventCb_ = nullptr; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->NotifyEvent(streamId_, event)); } @@ -179,6 +205,9 @@ HWTEST_F(DMicDevTest, SetUp_001, TestSize.Level1) mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->SetUp()); + + mic_->micTrans_ = std::make_shared(); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, mic_->SetUp()); } /** @@ -244,6 +273,9 @@ HWTEST_F(DMicDevTest, Stop_001, TestSize.Level1) mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->Stop()); EXPECT_FALSE(mic_->IsOpened()); + + mic_->echoManager_ = = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, mic_->Stop()); } /** @@ -277,6 +309,12 @@ HWTEST_F(DMicDevTest, Release_001, TestSize.Level1) mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->Release()); + + int32_t fd = 1; + int32_t ashmemLength = 960; + mic_->ashmem_ = sptr(new Ashmem(fd, ashmemLength)); + mic_->echoManager_ = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, mic_->Release()); } @@ -306,6 +344,15 @@ HWTEST_F(DMicDevTest, ReadStreamData_001, TestSize.Level1) std::shared_ptr readData1 = nullptr; EXPECT_EQ(DH_SUCCESS, mic_->ReadStreamData(streamId_, readData1)); + + mic_->curStatus_ = AudioStatus::STATUS_STOP; + EXPECT_EQ(ERR_DH_AUDIO_FAILED, mic_->ReadStreamData(streamId_, readData1)); + + mic_->insertFrameCnt_ = 1; + EXPECT_EQ(DH_SUCCESS, mic_->ReadStreamData(streamId_, readData1)); + + mic_->insertFrameCnt_ = 11; + EXPECT_EQ(DH_SUCCESS, mic_->ReadStreamData(streamId_, readData1)); } /** @@ -379,5 +426,27 @@ HWTEST_F(DMicDevTest, SendMessage_001, TestSize.Level1) mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->SendMessage(OPEN_MIC, content, dstDevId)); } + +/** + * @tc.name: RefreshAshmemInfo_001 + * @tc.desc: Verify RefreshAshmemInfo function. + * @tc.type: FUNC + * @tc.require: AR000H0E5F + */ +HWTEST_F(DMicDevTest, RefreshAshmemInfo_001, TestSize.Level1) +{ + int32_t fd = 1; + int32_t ashmemLength = 4096; + int32_t lengthPerTrans = 960; + mic_->param_.captureOpts.capturerFlags = NORMAL_MODE; + EXPECT_EQ(DH_SUCCESS, mic_->RefreshAshmemInfo(streamId_, fd, ashmemLength, lengthPerTrans)); + + mic_->ashmem_ = sptr(new Ashmem(fd, ashmemLength)); + mic_->param_.captureOpts.capturerFlags = MMAP_MODE; + EXPECT_EQ(DH_SUCCESS, mic_->RefreshAshmemInfo(streamId_, fd, ashmemLength, lengthPerTrans)); + + mic_->ashmem_ = nullptr; + EXPECT_EQ(DH_SUCCESS, mic_->RefreshAshmemInfo(streamId_, fd, ashmemLength, lengthPerTrans)); +} } // namespace DistributedHardware } // namespace OHOS -- Gitee From 42209d065f8881381228c4c0feee6146f4a2c9b1 Mon Sep 17 00:00:00 2001 From: zhonglufu Date: Fri, 9 Aug 2024 15:25:04 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91UT=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhonglufu --- .../sourcedevice/src/dmic_dev_test.cpp | 36 ++++--------------- 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index 6a5e13e8..54251d14 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -58,9 +58,9 @@ HWTEST_F(DMicDevTest, InitReceiverEngine_001, TestSize.Level1) mic_->OnEngineTransDataAvailable(audioData); EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->InitReceiverEngine(providerPtr)); mic_->micTrans_ = std::make_shared(); - EXPECT_EQ(DH_SUCCESS, mic_->InitReceiverEngine(providerPtr));. + EXPECT_EQ(DH_SUCCESS, mic_->InitReceiverEngine(providerPtr)); - AVTransEvent event = { EventType::EVENT_STOP_SUCCESS, "", "" }; + event = { EventType::EVENT_STOP_SUCCESS, "", "" }; mic_->OnEngineTransEvent(event); mic_->echoCannelOn_ = true; @@ -180,7 +180,7 @@ HWTEST_F(DMicDevTest, NotifyEvent_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, mic_->NotifyEvent(streamId_, event)); mic_->isTransReady_ = true; - for (int32_t i = 0; i < NOTIFY_WAIT_FRAMES; i++) { + for (int32_t i = 0; i < DMicDev::NOTIFY_WAIT_FRAMES; i++) { size_t size = 4096; auto audioData = std::make_shared(size); mic_->dataQueue_.push(audioData); @@ -274,8 +274,8 @@ HWTEST_F(DMicDevTest, Stop_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, mic_->Stop()); EXPECT_FALSE(mic_->IsOpened()); - mic_->echoManager_ = = std::make_shared(); - EXPECT_EQ(DH_SUCCESS, mic_->Stop()); + mic_->echoManager_ = std::make_shared(); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->Stop()); } /** @@ -310,9 +310,6 @@ HWTEST_F(DMicDevTest, Release_001, TestSize.Level1) mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->Release()); - int32_t fd = 1; - int32_t ashmemLength = 960; - mic_->ashmem_ = sptr(new Ashmem(fd, ashmemLength)); mic_->echoManager_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->Release()); } @@ -348,6 +345,7 @@ HWTEST_F(DMicDevTest, ReadStreamData_001, TestSize.Level1) mic_->curStatus_ = AudioStatus::STATUS_STOP; EXPECT_EQ(ERR_DH_AUDIO_FAILED, mic_->ReadStreamData(streamId_, readData1)); + mic_->curStatus_ = AudioStatus::STATUS_START; mic_->insertFrameCnt_ = 1; EXPECT_EQ(DH_SUCCESS, mic_->ReadStreamData(streamId_, readData1)); @@ -426,27 +424,5 @@ HWTEST_F(DMicDevTest, SendMessage_001, TestSize.Level1) mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->SendMessage(OPEN_MIC, content, dstDevId)); } - -/** - * @tc.name: RefreshAshmemInfo_001 - * @tc.desc: Verify RefreshAshmemInfo function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DMicDevTest, RefreshAshmemInfo_001, TestSize.Level1) -{ - int32_t fd = 1; - int32_t ashmemLength = 4096; - int32_t lengthPerTrans = 960; - mic_->param_.captureOpts.capturerFlags = NORMAL_MODE; - EXPECT_EQ(DH_SUCCESS, mic_->RefreshAshmemInfo(streamId_, fd, ashmemLength, lengthPerTrans)); - - mic_->ashmem_ = sptr(new Ashmem(fd, ashmemLength)); - mic_->param_.captureOpts.capturerFlags = MMAP_MODE; - EXPECT_EQ(DH_SUCCESS, mic_->RefreshAshmemInfo(streamId_, fd, ashmemLength, lengthPerTrans)); - - mic_->ashmem_ = nullptr; - EXPECT_EQ(DH_SUCCESS, mic_->RefreshAshmemInfo(streamId_, fd, ashmemLength, lengthPerTrans)); -} } // namespace DistributedHardware } // namespace OHOS -- Gitee From aea07bd318b9fa75f3ea7ad391a06d5506cef339 Mon Sep 17 00:00:00 2001 From: zhonglufu Date: Fri, 9 Aug 2024 15:55:59 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91UT=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhonglufu --- .../audiomanager/test/unittest/sourcedevice/BUILD.gn | 9 ++++++++- .../test/unittest/sourcedevice/src/dmic_dev_test.cpp | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn index 9300602b..53068a2c 100644 --- a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn @@ -126,7 +126,14 @@ ohos_unittest("DMicDevTest") { "samgr:samgr_proxy", ] - cflags = [] + cflags = [ + "-g", + "-O0", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + "-Dprivate=public", + "-Dprotected=public", + ] if (distributed_audio_extension_sa) { cflags += [ "-DECHO_CANNEL_ENABLE" ] diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index 54251d14..344ca515 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -15,6 +15,7 @@ #include "dmic_dev_test.h" +#include "daudio_echo_cannel_manager.h" using namespace testing::ext; namespace OHOS { -- Gitee From 2f2a59daa5094563bb29a2eb7d44d453954088e1 Mon Sep 17 00:00:00 2001 From: zhonglufu Date: Fri, 9 Aug 2024 16:02:16 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91UT=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhonglufu --- .../audiomanager/test/unittest/sourcedevice/BUILD.gn | 9 +-------- .../test/unittest/sourcedevice/src/dmic_dev_test.cpp | 10 ---------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn index 53068a2c..9300602b 100644 --- a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn @@ -126,14 +126,7 @@ ohos_unittest("DMicDevTest") { "samgr:samgr_proxy", ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - "-Dprivate=public", - "-Dprotected=public", - ] + cflags = [] if (distributed_audio_extension_sa) { cflags += [ "-DECHO_CANNEL_ENABLE" ] diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index 344ca515..f6005684 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -15,7 +15,6 @@ #include "dmic_dev_test.h" -#include "daudio_echo_cannel_manager.h" using namespace testing::ext; namespace OHOS { @@ -67,9 +66,6 @@ HWTEST_F(DMicDevTest, InitReceiverEngine_001, TestSize.Level1) mic_->echoCannelOn_ = true; mic_->echoManager_ = nullptr; mic_->OnEngineTransDataAvailable(audioData); - - mic_->echoManager_ = std::make_shared(); - mic_->OnEngineTransDataAvailable(audioData); } /** @@ -274,9 +270,6 @@ HWTEST_F(DMicDevTest, Stop_001, TestSize.Level1) mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->Stop()); EXPECT_FALSE(mic_->IsOpened()); - - mic_->echoManager_ = std::make_shared(); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->Stop()); } /** @@ -310,9 +303,6 @@ HWTEST_F(DMicDevTest, Release_001, TestSize.Level1) mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->Release()); - - mic_->echoManager_ = std::make_shared(); - EXPECT_EQ(DH_SUCCESS, mic_->Release()); } -- Gitee From 38ded356cb682f185d37000b817a155ad86e6fa4 Mon Sep 17 00:00:00 2001 From: zhonglufu Date: Fri, 9 Aug 2024 16:04:34 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91UT=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhonglufu --- .../test/unittest/sourcedevice/src/dmic_dev_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index f6005684..55c3abfd 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -64,7 +64,6 @@ HWTEST_F(DMicDevTest, InitReceiverEngine_001, TestSize.Level1) mic_->OnEngineTransEvent(event); mic_->echoCannelOn_ = true; - mic_->echoManager_ = nullptr; mic_->OnEngineTransDataAvailable(audioData); } -- Gitee From acd24a4441e9ab247336ab7e71862b3680237391 Mon Sep 17 00:00:00 2001 From: byndyx Date: Thu, 8 Aug 2024 16:26:26 +0800 Subject: [PATCH 08/12] add verfiy Signed-off-by: byndyx --- .../servicesink/include/daudio_sink_stub.h | 1 - .../servicesink/src/daudio_sink_stub.cpp | 34 +++++++++---------- .../servicesource/src/daudio_source_stub.cpp | 4 +++ .../servicesink/src/daudio_sink_stub_test.cpp | 10 +++--- .../src/daudio_source_stub_test.cpp | 2 +- .../src/daudio_echo_cannel_manager_test.cpp | 6 ++-- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/services/audiomanager/servicesink/include/daudio_sink_stub.h b/services/audiomanager/servicesink/include/daudio_sink_stub.h index 723811e6..d9882b4f 100644 --- a/services/audiomanager/servicesink/include/daudio_sink_stub.h +++ b/services/audiomanager/servicesink/include/daudio_sink_stub.h @@ -40,7 +40,6 @@ private: int32_t PauseDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option); int32_t ResumeDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option); int32_t StopDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option); - bool HasAccessDHPermission(); using DAudioSinkServiceFunc = int32_t (DAudioSinkStub::*)(MessageParcel &data, MessageParcel &reply, MessageOption &option); diff --git a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp index 5c269580..7a47305e 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp @@ -128,6 +128,10 @@ int32_t DAudioSinkStub::ReleaseSinkInner(MessageParcel &data, MessageParcel &rep int32_t DAudioSinkStub::SubscribeLocalHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { + if (!VerifyPermission()) { + DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; + } std::string dhId = data.ReadString(); std::string param = data.ReadString(); int32_t ret = SubscribeLocalHardware(dhId, param); @@ -137,6 +141,10 @@ int32_t DAudioSinkStub::SubscribeLocalHardwareInner(MessageParcel &data, Message int32_t DAudioSinkStub::UnsubscribeLocalHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { + if (!VerifyPermission()) { + DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; + } std::string dhId = data.ReadString(); int32_t ret = UnsubscribeLocalHardware(dhId); reply.WriteInt32(ret); @@ -156,9 +164,9 @@ int32_t DAudioSinkStub::DAudioNotifyInner(MessageParcel &data, MessageParcel &re int32_t DAudioSinkStub::PauseDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - if (!HasAccessDHPermission()) { - DHLOGE("The caller has no ACCESS_DISTRIBUTED_HARDWARE permission."); - return ERR_DH_AUDIO_ACCESS_PERMISSION_CHECK_FAIL; + if (!VerifyPermission()) { + DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; } std::string networkId = data.ReadString(); int32_t ret = PauseDistributedHardware(networkId); @@ -168,9 +176,9 @@ int32_t DAudioSinkStub::PauseDistributedHardwareInner(MessageParcel &data, Messa int32_t DAudioSinkStub::ResumeDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - if (!HasAccessDHPermission()) { - DHLOGE("The caller has no ACCESS_DISTRIBUTED_HARDWARE permission."); - return ERR_DH_AUDIO_ACCESS_PERMISSION_CHECK_FAIL; + if (!VerifyPermission()) { + DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; } std::string networkId = data.ReadString(); int32_t ret = ResumeDistributedHardware(networkId); @@ -180,22 +188,14 @@ int32_t DAudioSinkStub::ResumeDistributedHardwareInner(MessageParcel &data, Mess int32_t DAudioSinkStub::StopDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - if (!HasAccessDHPermission()) { - DHLOGE("The caller has no ACCESS_DISTRIBUTED_HARDWARE permission."); - return ERR_DH_AUDIO_ACCESS_PERMISSION_CHECK_FAIL; + if (!VerifyPermission()) { + DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; } std::string networkId = data.ReadString(); int32_t ret = StopDistributedHardware(networkId); reply.WriteInt32(ret); return DH_SUCCESS; } - -bool DAudioSinkStub::HasAccessDHPermission() -{ - Security::AccessToken::AccessTokenID callerToken = IPCSkeleton::GetCallingTokenID(); - const std::string permissionName = "ohos.permission.ACCESS_DISTRIBUTED_HARDWARE"; - int32_t result = Security::AccessToken::AccessTokenKit::VerifyAccessToken(callerToken, permissionName); - return (result == Security::AccessToken::PERMISSION_GRANTED); -} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/audiomanager/servicesource/src/daudio_source_stub.cpp b/services/audiomanager/servicesource/src/daudio_source_stub.cpp index a44a5dd4..93491e4d 100644 --- a/services/audiomanager/servicesource/src/daudio_source_stub.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_stub.cpp @@ -153,6 +153,10 @@ int32_t DAudioSourceStub::UnregisterDistributedHardwareInner(MessageParcel &data int32_t DAudioSourceStub::ConfigDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { + if (!VerifyPermission()) { + DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; + } std::string networkId = data.ReadString(); std::string dhId = data.ReadString(); std::string key = data.ReadString(); diff --git a/services/audiomanager/test/unittest/servicesink/src/daudio_sink_stub_test.cpp b/services/audiomanager/test/unittest/servicesink/src/daudio_sink_stub_test.cpp index afda823d..4c51bde6 100644 --- a/services/audiomanager/test/unittest/servicesink/src/daudio_sink_stub_test.cpp +++ b/services/audiomanager/test/unittest/servicesink/src/daudio_sink_stub_test.cpp @@ -98,11 +98,11 @@ HWTEST_F(DAudioSinkStubTest, PauseDistributedHardwareInner_001, TestSize.Level1) MessageParcel data; MessageParcel reply; MessageOption option; - EXPECT_EQ(ERR_DH_AUDIO_ACCESS_PERMISSION_CHECK_FAIL, + EXPECT_EQ(ERR_DH_AUDIO_SA_PERMISSION_FAIED, sinkStub_->PauseDistributedHardwareInner(data, reply, option)); - EXPECT_EQ(ERR_DH_AUDIO_ACCESS_PERMISSION_CHECK_FAIL, + EXPECT_EQ(ERR_DH_AUDIO_SA_PERMISSION_FAIED, sinkStub_->ResumeDistributedHardwareInner(data, reply, option)); - EXPECT_EQ(ERR_DH_AUDIO_ACCESS_PERMISSION_CHECK_FAIL, + EXPECT_EQ(ERR_DH_AUDIO_SA_PERMISSION_FAIED, sinkStub_->StopDistributedHardwareInner(data, reply, option)); } @@ -117,8 +117,8 @@ HWTEST_F(DAudioSinkStubTest, SubscribeLocalHardwareInner_001, TestSize.Level1) MessageParcel data; MessageParcel reply; MessageOption option; - EXPECT_EQ(DH_SUCCESS, sinkStub_->SubscribeLocalHardwareInner(data, reply, option)); - EXPECT_EQ(DH_SUCCESS, sinkStub_->UnsubscribeLocalHardwareInner(data, reply, option)); + EXPECT_EQ(ERR_DH_AUDIO_SA_PERMISSION_FAIED, sinkStub_->SubscribeLocalHardwareInner(data, reply, option)); + EXPECT_EQ(ERR_DH_AUDIO_SA_PERMISSION_FAIED, sinkStub_->UnsubscribeLocalHardwareInner(data, reply, option)); EXPECT_EQ(DH_SUCCESS, sinkStub_->DAudioNotifyInner(data, reply, option)); } } // DistributedHardware diff --git a/services/audiomanager/test/unittest/servicesource/src/daudio_source_stub_test.cpp b/services/audiomanager/test/unittest/servicesource/src/daudio_source_stub_test.cpp index 31ae3a6a..56f609f9 100644 --- a/services/audiomanager/test/unittest/servicesource/src/daudio_source_stub_test.cpp +++ b/services/audiomanager/test/unittest/servicesource/src/daudio_source_stub_test.cpp @@ -114,7 +114,7 @@ HWTEST_F(DAudioSourceStubTest, ConfigDistributedHardwareInner_001, TestSize.Leve MessageParcel data; MessageParcel reply; MessageOption option; - EXPECT_EQ(DH_SUCCESS, sourceStub_->ConfigDistributedHardwareInner(data, reply, option)); + EXPECT_EQ(ERR_DH_AUDIO_SA_PERMISSION_FAIED, sourceStub_->ConfigDistributedHardwareInner(data, reply, option)); EXPECT_EQ(DH_SUCCESS, sourceStub_->DAudioNotifyInner(data, reply, option)); } } // DistributedHardware diff --git a/services/audiomanager/test/unittest/sourcedevice/src/daudio_echo_cannel_manager_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/daudio_echo_cannel_manager_test.cpp index c77832ac..7158b4da 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/daudio_echo_cannel_manager_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/daudio_echo_cannel_manager_test.cpp @@ -74,9 +74,9 @@ HWTEST_F(DAudioEchoCannelManagerTest, OnMicDataReceived_001, TestSize.Level1) */ HWTEST_F(DAudioEchoCannelManagerTest, AudioCaptureSetUp_001, TestSize.Level1) { - EXPECT_EQ(DH_SUCCESS, echoCannelManager_->AudioCaptureSetUp()); - EXPECT_EQ(DH_SUCCESS, echoCannelManager_->AudioCaptureStart()); - EXPECT_EQ(DH_SUCCESS, echoCannelManager_->AudioCaptureStop()); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, echoCannelManager_->AudioCaptureSetUp()); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, echoCannelManager_->AudioCaptureStart()); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, echoCannelManager_->AudioCaptureStop()); EXPECT_EQ(DH_SUCCESS, echoCannelManager_->AudioCaptureRelease()); } -- Gitee From 990172786d7e6a943b4ee833a76b6bfb18f56586 Mon Sep 17 00:00:00 2001 From: Bobie Date: Mon, 12 Aug 2024 18:24:10 +0800 Subject: [PATCH 09/12] add pr template Signed-off-by: Bobie --- .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md new file mode 100644 index 00000000..fb627c71 --- /dev/null +++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md @@ -0,0 +1,35 @@ +**Issue编号**: + +**描述**: + +**安全及低级编码自检：** +| 自检项 | 自检结果 | +| ------------------------------------------------------------------------------------------------------------ | -------- | +| 变量使用前保证赋有效初值 | | +| 结构体预留字段也必须初始化为0，不允许出现随机值 | | +| 指针变量必须显示初始化为空 | | +| 涉及内存拷贝时合理校验目标内存大小，保证目标内存大于等于源内存 | | +| 进行字符串操作时，如字符串复制、申请字符串内存等，需要考虑字符串结束符 | | +| cJSON指针在异常分支里均需考虑内存释放(cJSON_free/cJSON_Delete)，防止内存泄漏 | | +| 内存资源、文件句柄、管道资源、Socket句柄异常退出时要及时关闭 | | +| malloc申请内存后必须判断是否为空 | | +| 指针解引用或释放前判空(lamda表达式，异步任务等使用指针前需判空) | | +| 内存释放后立即置空，防止出现UAF | | +| 循环时容器的增、删、改操作，必须保证迭代器有效 | | +| 禁止将栈内存地址作为返回值或赋值给全局变量 | | +| 加法、乘法、减法操作，必须进行溢出和翻转保护，确保先校验再运算 | | +| 除法、求余操作必须进行除零保护 | | +| 循环变量用整型，禁止使用浮点型 | | +| 循环退出条件一定确保可达，防止出现死循环等问题 | | +| 不同大小结构体禁止强转 | | +| 禁止使用非安全函数，使用封装好的安全函数 | | +| 对用户日志/私有日志/诊断日志等日志进行PassWord/位置信息/networkId/devId/uuid/udid等关键字检查，避免明文打印敏感信息 | | +| 对函数入参坚持先校验后使用的原则(指针判空、整型变量校验范围) | | +| 跨进程调用需注意权限校验，对外部传入的PID、tokenID进行权限校验 | | +| 共享数据均需加锁保护，并且锁配对使用 | | +| 条件变量正确加锁，消除条件变量唤醒丢失等问题 | | +| 加锁范围确保合理，避免过大或过小导致死锁问题 | | + +**TDD结果**: + +**XTS结果**: -- Gitee From f620f7c8abe5fabc32a40407246e2901ce7da8fd Mon Sep 17 00:00:00 2001 From: w30042960 Date: Tue, 20 Aug 2024 16:25:45 +0800 Subject: [PATCH 10/12] modify UT Signed-off-by: w30042960 --- common/dfx_utils/test/unittest/src/daudio_hitrace_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/common/dfx_utils/test/unittest/src/daudio_hitrace_test.cpp b/common/dfx_utils/test/unittest/src/daudio_hitrace_test.cpp index 3b06c2ef..b8856bd4 100644 --- a/common/dfx_utils/test/unittest/src/daudio_hitrace_test.cpp +++ b/common/dfx_utils/test/unittest/src/daudio_hitrace_test.cpp @@ -52,6 +52,7 @@ HWTEST_F(DAudioHitraceTest, End_001, TestSize.Level1) hitrace_->End(); hitrace_->isFinished_ = true; hitrace_->End(); + EXPECT_EQ(true, hitrace_->isFinished_); } } // DistributedHardware } // OHOS -- Gitee From a38b9c81dab005ae41e9d39a8151a115b8e1499a Mon Sep 17 00:00:00 2001 From: w30042960 Date: Sat, 24 Aug 2024 10:48:33 +0800 Subject: [PATCH 11/12] modify gn Signed-off-by: w30042960 --- 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 From cfdce39e564097330ca311e446a75858028ecdae Mon Sep 17 00:00:00 2001 From: w30042960 Date: Wed, 28 Aug 2024 16:15:47 +0800 Subject: [PATCH 12/12] modify dcts Signed-off-by: w30042960 --- services/audiomanager/managersource/include/dmic_dev.h | 2 -- services/audiomanager/managersource/src/dmic_dev.cpp | 7 ------- .../test/unittest/sourcedevice/src/dmic_dev_test.cpp | 3 ++- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/services/audiomanager/managersource/include/dmic_dev.h b/services/audiomanager/managersource/include/dmic_dev.h index 17b6ca90..0bfd1a84 100644 --- a/services/audiomanager/managersource/include/dmic_dev.h +++ b/services/audiomanager/managersource/include/dmic_dev.h @@ -101,8 +101,6 @@ private: const std::string DUMP_DAUDIO_MIC_READ_FROM_BUF_NAME = "dump_source_mic_read_from_trans.pcm"; const std::string DUMP_DAUDIO_LOWLATENCY_MIC_FROM_BUF_NAME = "dump_source_mic_write_to_ashmem.pcm"; const int32_t ASHMEM_MAX_LEN = 2 * 4096; - static constexpr size_t NOTIFY_WAIT_FRAMES = 5; - static constexpr uint32_t NOTIFY_WAIT_TIME_US = 20000; std::weak_ptr audioEventCallback_; std::mutex dataQueueMtx_; diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp index fb4889b0..1dd07fd9 100644 --- a/services/audiomanager/managersource/src/dmic_dev.cpp +++ b/services/audiomanager/managersource/src/dmic_dev.cpp @@ -212,13 +212,6 @@ int32_t DMicDev::NotifyEvent(const int32_t streamId, const AudioEvent &event) switch (event.type) { case AudioEventType::AUDIO_START: curStatus_ = AudioStatus::STATUS_START; - while (isTransReady_.load()) { - std::lock_guard lock(dataQueueMtx_); - if (dataQueue_.size() >= NOTIFY_WAIT_FRAMES) { - break; - } - usleep(NOTIFY_WAIT_TIME_US); - } isExistedEmpty_.store(false); break; case AudioEventType::AUDIO_STOP: diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index 55c3abfd..5e333186 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -20,6 +20,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { constexpr int32_t DH_ID = 1; +constexpr size_t NOTIFY_WAIT_FRAMES = 5; constexpr int32_t DH_ID_MIC = 134217728; const std::string DEV_ID = "Test_Dev_Id"; const std::string CAP = "Test_Capability"; @@ -176,7 +177,7 @@ HWTEST_F(DMicDevTest, NotifyEvent_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, mic_->NotifyEvent(streamId_, event)); mic_->isTransReady_ = true; - for (int32_t i = 0; i < DMicDev::NOTIFY_WAIT_FRAMES; i++) { + for (int32_t i = 0; i < NOTIFY_WAIT_FRAMES; i++) { size_t size = 4096; auto audioData = std::make_shared(size); mic_->dataQueue_.push(audioData); -- Gitee