diff --git a/distributedaudio.gni b/distributedaudio.gni index 2227a8bab4555b89dc8e3d52df9966a61ac215eb..264438a52026950b02519b8825846ad049738092 100644 --- a/distributedaudio.gni +++ b/distributedaudio.gni @@ -45,7 +45,3 @@ innerkits_path = "${distributedaudio_path}/interfaces/inner_kits" distributedaudio_fuzz_path = "distributed_audio/distributed_audio" build_flags = [ "-Werror" ] - -declare_args() { - distributed_audio_extension = false -} diff --git a/services/audiomanager/managersink/include/daudio_sink_dev.h b/services/audiomanager/managersink/include/daudio_sink_dev.h index fa5f34a0a7023aba9caf92fe088a9d23b1cb44d7..e97cf96bdbb6b66abf854d09f91c636815549a01 100644 --- a/services/audiomanager/managersink/include/daudio_sink_dev.h +++ b/services/audiomanager/managersink/include/daudio_sink_dev.h @@ -33,11 +33,6 @@ #include "i_av_engine_provider.h" #include "i_av_receiver_engine_callback.h" -#ifdef DAUDIO_SUPPORT_DIRECT -#include "direct_dmic_client.h" -#include "direct_dspeaker_client.h" -#endif - using json = nlohmann::json; namespace OHOS { diff --git a/services/audiomanager/servicesink/BUILD.gn b/services/audiomanager/servicesink/BUILD.gn index b93b70744d344180e7792bdb92c59d963a8d9750..2c6f68cf0fbac1aebce01eff2e91617935f83751 100755 --- a/services/audiomanager/servicesink/BUILD.gn +++ b/services/audiomanager/servicesink/BUILD.gn @@ -63,13 +63,6 @@ ohos_shared_library("distributed_audio_sink") { "${softbusadapter_path}/include", ] - if (distributed_audio_extension) { - include_dirs += [ - "${distributedaudio_ext_path}/services/audioclient/directmicclient/include", - "${distributedaudio_ext_path}/services/audioclient/directspkclient/include", - ] - } - sources = [ "${audio_client_path}/micclient/src/dmic_client.cpp", "${audio_client_path}/spkclient/src/dspeaker_client.cpp", @@ -85,13 +78,6 @@ ohos_shared_library("distributed_audio_sink") { "src/daudio_sink_stub.cpp", ] - if (distributed_audio_extension) { - sources += [ - "${distributedaudio_ext_path}/services/audioclient/directmicclient/src/direct_dmic_client.cpp", - "${distributedaudio_ext_path}/services/audioclient/directspkclient/src/direct_dspeaker_client.cpp", - ] - } - deps = [ "${audio_transport_path}/decodetransport:distributed_audio_decode_transport", "${audio_transport_path}/encodetransport:distributed_audio_encode_transport", @@ -121,10 +107,6 @@ ohos_shared_library("distributed_audio_sink") { "samgr:samgr_proxy", ] - if (distributed_audio_extension) { - cflags = [ "-DDAUDIO_SUPPORT_DIRECT" ] - } - defines = [ "HI_LOG_ENABLE", "LOG_DOMAIN=0xD004100",