diff --git a/services/audioclient/test/unittest/spkclient/BUILD.gn b/services/audioclient/test/unittest/spkclient/BUILD.gn index c758d7052908010036b30c4bb60079be958e54d9..db812ce56e7384876b01aa7eea2f0568a750f608 100644 --- a/services/audioclient/test/unittest/spkclient/BUILD.gn +++ b/services/audioclient/test/unittest/spkclient/BUILD.gn @@ -22,7 +22,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/multimedia/audio_framework/frameworks/native/audiopolicy/include", "${mediastandardfwk_path}/audiocommon/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiorenderer/include", diff --git a/services/audiomanager/managersink/include/daudio_sink_dev.h b/services/audiomanager/managersink/include/daudio_sink_dev.h index 8e5d07efa396afb8fcfd7ce822cae8dfa34b6db0..1a87a97a42ad10b5edd1d51192e5153b70b53bc7 100644 --- a/services/audiomanager/managersink/include/daudio_sink_dev.h +++ b/services/audiomanager/managersink/include/daudio_sink_dev.h @@ -29,7 +29,7 @@ #include "imic_client.h" #include "ispk_client.h" #include "iaudio_event_callback.h" -#ifdef DDAUDIO_SUPPORT_DIRECT +#ifdef DAUDIO_SUPPORT_DIRECT #include "direct_dmic_client.h" #include "direct_dspeaker_client.h" #endif diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index 566e508b079a87f5a782c29cc02bc9ce1a8b12d3..f6f2b1358382aec4930e3adc97964eb34f9a489f 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -394,7 +394,7 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) if (speakerClient_ == nullptr) { speakerClient_ = std::make_shared(devId_, shared_from_this()); } -#ifdef DDAUDIO_SUPPORT_DIRECT +#ifdef DAUDIO_SUPPORT_DIRECT if (audioParam.renderOpts.renderFlags == MMAP_MODE) { DHLOGI("Try to mmap mode."); speakerClient_ = std::shared_ptr(); @@ -464,7 +464,7 @@ int32_t DAudioSinkDev::TaskOpenDMic(const std::string &args) if (micClient_ == nullptr) { micClient_ = std::make_shared(devId_, shared_from_this()); } -#ifdef DDAUDIO_SUPPORT_DIRECT +#ifdef DAUDIO_SUPPORT_DIRECT if (audioParam.captureOpts.capturerFlags == MMAP_MODE) { DHLOGI("Try to mmap mode."); micClient_ = std::make_shared(); diff --git a/services/softbusadapter/BUILD.gn b/services/softbusadapter/BUILD.gn index eb042afac99bbeaacb584bc8f00a884ec0fa7ac8..d460346c44434687dd42733bdf3333e473fe9c10 100644 --- a/services/softbusadapter/BUILD.gn +++ b/services/softbusadapter/BUILD.gn @@ -17,7 +17,6 @@ import("../../distributedaudio.gni") ohos_shared_library("distributed_audio_softbus_adapter") { include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/common", "${fwk_common_path}/utils/include", "//third_party/json/include", ]