3 files changed, 12 insertions, 0 deletions
diff --git a/libs/audioflinger/Android.mk b/libs/audioflinger/Android.mk
index 3082813..bd64135 100644
--- a/libs/audioflinger/Android.mk
+++ b/libs/audioflinger/Android.mk
@@ -105,6 +105,10 @@ endif
 
 LOCAL_MODULE:= libaudioflinger
 
+ifeq ($(BOARD_USES_ECLAIR_LIBCAMERA),true)
+  LOCAL_CFLAGS += -DUSE_ECLAIR_MEMORYDEALER
+endif
+
 ifeq ($(BOARD_HAVE_BLUETOOTH),true)
   LOCAL_CFLAGS += -DWITH_BLUETOOTH -DWITH_A2DP
   LOCAL_SHARED_LIBRARIES += liba2dp
diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp
index a2fbca1..890692d 100644
--- a/libs/audioflinger/AudioFlinger.cpp
+++ b/libs/audioflinger/AudioFlinger.cpp
@@ -3069,7 +3069,11 @@ void AudioFlinger::PlaybackThread::OutputTrack::clearBufferQueue()
 AudioFlinger::Client::Client(const sp<AudioFlinger>& audioFlinger, pid_t pid)
     :   RefBase(),
         mAudioFlinger(audioFlinger),
+#ifdef USE_ECLAIR_MEMORYDEALER
+        mMemoryDealer(new MemoryDealer(1024*1024)),
+#else
         mMemoryDealer(new MemoryDealer(1024*1024, "AudioFlinger::Client")),
+#endif
         mPid(pid)
 {
     // 1 MB of address space is good for 32 tracks, 8 buffers each, 4 KB/buffer
diff --git a/libs/audioflinger/AudioFlinger.h b/libs/audioflinger/AudioFlinger.h
index 8f99cf8..d310477 100644
--- a/libs/audioflinger/AudioFlinger.h
+++ b/libs/audioflinger/AudioFlinger.h
@@ -31,7 +31,11 @@
 #include <utils/Atomic.h>
 #include <utils/Errors.h>
 #include <utils/threads.h>
+#ifdef USE_ECLAIR_MEMORYDEALER
+#include <binder/MemoryDealerEclair.h>
+#else
 #include <binder/MemoryDealer.h>
+#endif
 #include <utils/SortedVector.h>
 #include <utils/Vector.h>