From 603dd9cbd0c3fd973a0210481099b807963fd9b2 Mon Sep 17 00:00:00 2001
From: bobie <zhouchuanbo2@huawei.com>
Date: Wed, 8 Nov 2023 09:09:50 +0800
Subject: [PATCH] remove the macro of daudio extension

Signed-off-by: bobie <zhouchuanbo2@huawei.com>
---
 distributedaudio.gni                           |  4 ----
 .../managersink/include/daudio_sink_dev.h      |  5 -----
 services/audiomanager/servicesink/BUILD.gn     | 18 ------------------
 3 files changed, 27 deletions(-)

diff --git a/distributedaudio.gni b/distributedaudio.gni
index 2227a8ba..264438a5 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 fa5f34a0..e97cf96b 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 b93b7074..2c6f68cf 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",
-- 
Gitee