Move away from MediaDebug and use ADebug instead

Change-Id: Id904857259a5de0b77f09716315ceb8f665af4e0

proprietary/wvm/Android.mk

@@ -17,6 +17,10 @@ LOCAL_SRC_FILES:=           \
     WVMMediaSource.cpp      \
     WVMInfoListener.cpp
 
+LOCAL_SHARED_LIBRARIES := \
+    libstagefright \
+    libstagefright_foundation
+
 LOCAL_MODULE := libwvmcommon
 LOCAL_MODULE_TAGS := optional
 

proprietary/wvm/WVMFileSource.cpp

@@ -8,7 +8,6 @@
 #include "WVMFileSource.h"
 #include "media/stagefright/MediaErrors.h"
 #include "media/stagefright/MediaDefs.h"
-#include "media/stagefright/MediaDebug.h"
 
 namespace android {
 

proprietary/wvm/WVMMediaSource.cpp

@@ -9,9 +9,9 @@
 #include "WVMFileSource.h"
 #include "WVMExtractorImpl.h"
 #include "WVMErrorCodes.h"
+#include "media/stagefright/foundation/ADebug.h"
 #include "media/stagefright/MediaErrors.h"
 #include "media/stagefright/MediaDefs.h"
-#include "media/stagefright/MediaDebug.h"
 #include "AndroidHooks.h"
 
 namespace android {
@@ -235,7 +235,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
     status_t err = mGroup->acquire_buffer(&mediaBuf);
 
     if (err != OK) {
-        CHECK_EQ(mediaBuf, NULL);
+        CHECK(mediaBuf == NULL);
         return err;
     }
 

proprietary/wvm/test/Testlibwvm.cpp

@@ -14,7 +14,6 @@
 #include <media/stagefright/MetaData.h>
 #include <media/stagefright/MediaErrors.h>
 #include <media/stagefright/MediaBuffer.h>
-#include <media/stagefright/MediaDebug.h>
 
 using namespace android;
 using namespace std;