summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-08-08 01:27:35 -0400
committerSteve Kondik <shade@chemlab.org>2010-08-08 01:27:35 -0400
commitebc4e9c2db0bd36e9504f25c11b064a231b382ad (patch)
tree4c4d8cb372fea137c885312847973f9e87043051 /media
parent30b3f7a1f05a24baf1d798231813adc560c308b8 (diff)
downloadframeworks_base-ebc4e9c2db0bd36e9504f25c11b064a231b382ad.zip
frameworks_base-ebc4e9c2db0bd36e9504f25c11b064a231b382ad.tar.gz
frameworks_base-ebc4e9c2db0bd36e9504f25c11b064a231b382ad.tar.bz2
Fix missing ifdefs
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/OMXCodec.cpp4
-rw-r--r--media/libstagefright/omx/tests/OMXHarness.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index e9a7248..f299f58 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -30,7 +30,11 @@
#include "include/ESDS.h"
#include <binder/IServiceManager.h>
+#ifdef USE_ECLAIR_MEMORYDEALER
+#include <binder/MemoryDealerEclair.h>
+#else
#include <binder/MemoryDealer.h>
+#endif
#include <binder/ProcessState.h>
#include <media/IMediaPlayerService.h>
#include <media/stagefright/MediaBuffer.h>
diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp
index dc466c8..4e2a9e3 100644
--- a/media/libstagefright/omx/tests/OMXHarness.cpp
+++ b/media/libstagefright/omx/tests/OMXHarness.cpp
@@ -24,7 +24,11 @@
#include <binder/ProcessState.h>
#include <binder/IServiceManager.h>
+#ifdef USE_ECLAIR_MEMORYDEALER
+#include <binder/MemoryDealerEclair.h>
+#else
#include <binder/MemoryDealer.h>
+#endif
#include <media/IMediaPlayerService.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaBuffer.h>