widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace toStatus indirection.

Browse Source 
CdmResponseType are mapped to android::status_t, then map to hidl
android::hardware::drm::V1_0::Status. This CL removes the indirection
by mapping cdm errors to hidl Status.

Test: Play Movies (pin and streaming)
Test: Netflix (download and streaming)
Test: libwvdrmmediacrypto_hidl_test and libwvdrmdrmplugin_hidl_test
Test: GtsMediaTestCases module
Test: Vts - VtsHalDrmV1_0Target

bug: 34682447
Change-Id: I0b04f47871f5e4898e7297831d5fceab52e0f7f9
This commit is contained in:
Edwin Wong
2017-05-18 09:01:42 -07:00
parent 496b184ddd
commit 485f11483c
12 changed files with 491 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libwvdrmengine/Android.mk
View File

@@ -109,30 +109,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
include $(BUILD_STATIC_LIBRARY)
# -----------------------------------------------------------------------------
# Builds libwidevinehidl_utils.a
#
include $(CLEAR_VARS)
LOCAL_MODULE := libwidevinehidl_utils
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/include_hidl
LOCAL_SRC_FILES := \
src_hidl/TypeConvert.cpp
LOCAL_HEADER_LIBRARIES := \
libstagefright_headers
LOCAL_SHARED_LIBRARIES := \
android.hardware.drm@1.0
include $(BUILD_STATIC_LIBRARY)
# -----------------------------------------------------------------------------
# Builds libwvdrmengine.so
#
@@ -226,11 +202,6 @@ LOCAL_STATIC_LIBRARIES := \
libwvdrmdrmplugin_hidl \
libwvlevel3 \
# When the GNU linker sees a library, it discards all symbols that it doesn't
# need. libwidevinehidl_utils must come after both libwvdrmcryptoplugin and
# libwvdrmdrmplugin.
LOCAL_STATIC_LIBRARIES += libwidevinehidl_utils
LOCAL_SHARED_LIBRARIES := \
android.hardware.drm@1.0 \
android.hidl.memory@1.0 \