am 8c5545ef: Merge "Fix for b/4198446 HC - Support for Widevine Adaptive VOD Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed() Added error logging to diagnose problems such as b/4430078 Playback of newly rented movie fails with "licens

* commit '8c5545ef76f39094b016986c7deec02df682356d':
  Fix for b/4198446 HC - Support for Widevine Adaptive VOD Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed() Added error logging to diagnose problems such as b/4430078 Playback of newly rented     movie fails with "license expired"
This commit is contained in:
Jeffrey Tinker
2011-05-24 12:57:28 -07:00
committed by Android Git Automerger
9 changed files with 140 additions and 22 deletions

View File

@@ -8,13 +8,14 @@ LOCAL_SRC_FILES:= \
WVMLogging.cpp \
WVMExtractorImpl.cpp \
WVMFileSource.cpp \
WVMMediaSource.cpp \
WVMMediaSource.cpp \
WVMInfoListener.cpp
LOCAL_C_INCLUDES:= \
bionic \
bionic/libstdc++ \
external/stlport/stlport \
frameworks/base/media/libstagefright/include \
vendor/widevine/proprietary/streamcontrol/include \
vendor/widevine/proprietary/wvm/include