From c8d0ddadf50e70a2fca02064b61ea49e85734503 Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Tue, 22 Sep 2015 15:14:43 -0700
Subject: [PATCH] Extractors are now binderized

Change-Id: I96030f2a345aa41193cea57e6f2f925eedea7957
---
 proprietary/wvm/WVMExtractorImpl.cpp       | 2 +-
 proprietary/wvm/include/WVMExtractorImpl.h | 2 +-
 proprietary/wvm/wvm-core.mk                | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/proprietary/wvm/WVMExtractorImpl.cpp b/proprietary/wvm/WVMExtractorImpl.cpp
index 0ec860e2..5fb3a50e 100644
--- a/proprietary/wvm/WVMExtractorImpl.cpp
+++ b/proprietary/wvm/WVMExtractorImpl.cpp
@@ -487,7 +487,7 @@ size_t WVMExtractorImpl::countTracks() {
     return 2;  // 1 audio + 1 video
 }
 
-sp<MediaSource> WVMExtractorImpl::getTrack(size_t index)
+sp<IMediaSource> WVMExtractorImpl::getTrack(size_t index)
 {
     status_t err;
     if ((err = readMetaData()) != OK) {
diff --git a/proprietary/wvm/include/WVMExtractorImpl.h b/proprietary/wvm/include/WVMExtractorImpl.h
index 17726f5a..51e60cd4 100644
--- a/proprietary/wvm/include/WVMExtractorImpl.h
+++ b/proprietary/wvm/include/WVMExtractorImpl.h
@@ -27,7 +27,7 @@ public:
     WVMExtractorImpl(sp<DataSource> dataSource);
 
     virtual size_t countTracks();
-    virtual sp<MediaSource> getTrack(size_t index);
+    virtual sp<IMediaSource> getTrack(size_t index);
     virtual sp<MetaData> getTrackMetaData(size_t index, uint32_t flags);
 
     virtual sp<MetaData> getMetaData();
diff --git a/proprietary/wvm/wvm-core.mk b/proprietary/wvm/wvm-core.mk
index 139465b5..0d452f02 100644
--- a/proprietary/wvm/wvm-core.mk
+++ b/proprietary/wvm/wvm-core.mk
@@ -13,7 +13,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
     libwvmcommon
 
 LOCAL_SHARED_LIBRARIES := \
+    libbinder \
+    libmedia \
     libstagefright \
+    libstagefright_foundation \
     libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \
     libdrmframework \
     libcutils \