commit 8c7ab034692eea550b97bebd7746e1a82735bbbd
author Andreas Huber <andih@google.com> Mon Dec 07 11:23:44 2009 -0800
committer Andreas Huber <andih@google.com> Mon Dec 07 11:23:44 2009 -0800
tree 4fba99b8ded13e56433a16bdd929af3e5996d0e8
parent 73abc2ea4c4e23a5561bbf769b4b74d1faa38e4a

Fixing the build, only instantiate the software aac decoder in full stagefright builds.

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 7e9b8ad..ecaf31d 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -18,7 +18,10 @@
 #define LOG_TAG "OMXCodec"
 #include <utils/Log.h>
 
+#if BUILD_WITH_FULL_STAGEFRIGHT
 #include "include/AACDecoder.h"
+#endif
+
 #include "include/ESDS.h"
 
 #include <binder/IServiceManager.h>
@@ -285,9 +288,11 @@
     bool success = meta->findCString(kKeyMIMEType, &mime);
     CHECK(success);
 
+#if BUILD_WITH_FULL_STAGEFRIGHT
     if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) {
         return new AACDecoder(source);
     }
+#endif
 
     Vector<String8> matchingCodecs;
     findMatchingCodecs(