diff options
author | Edwin Wong <edwinwong@google.com> | 2012-08-01 11:30:39 -0700 |
---|---|---|
committer | Edwin Wong <edwinwong@google.com> | 2012-08-03 13:32:00 -0700 |
commit | 6e18d140dfd80193121abf35764b8dad2f369041 (patch) | |
tree | 0459e1b390771533126ebbc00f04c7eaecbb86fe | |
parent | 741df2bd6f7e1fb0f2ef1194d7cf1325d327d5a4 (diff) | |
download | hardware_ti_omap4xxx-6e18d140dfd80193121abf35764b8dad2f369041.zip hardware_ti_omap4xxx-6e18d140dfd80193121abf35764b8dad2f369041.tar.gz hardware_ti_omap4xxx-6e18d140dfd80193121abf35764b8dad2f369041.tar.bz2 |
Revert Widevine 6.0.0 -> 4.5.0 libraries
Includes Widevine libraries Version 4.5.0.7809
Also fixed samplePlayer's MediaCodec mode not running and
WVDrmInfoRequestStatusKey returning incorrect value.
Change-Id: I1d7df9cf3935d7fec143e326f142e974979cc69b
related-to-bug: 6929628
related-to-bug: 6833718
related-to-bug: 6889322
-rw-r--r-- | libdrmdecrypt/Android.mk | 32 | ||||
-rw-r--r-- | omap4.mk | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/libdrmdecrypt/Android.mk b/libdrmdecrypt/Android.mk new file mode 100644 index 0000000..324221c --- /dev/null +++ b/libdrmdecrypt/Android.mk @@ -0,0 +1,32 @@ +ifeq ($(TARGET_BOARD_PLATFORM),omap4) + +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +ifneq ($(TARGET_DEVICE),panda) +-include $(TOP)/vendor/widevine/proprietary/cryptoPlugin/decrypt-core.mk +endif + +LOCAL_C_INCLUDES:= \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/vendor/widevine/proprietary/cryptoPlugin \ + +ifeq ($(BOARD_USES_SECURE_SERVICES),true) +LOCAL_STATIC_LIBRARIES += \ + libtee_client_api_driver \ + +endif + +LOCAL_SHARED_LIBRARIES := \ + libstagefright_foundation \ + liblog \ + libcutils \ + libcrypto + +LOCAL_MODULE := libdrmdecrypt + +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) + +endif @@ -24,8 +24,9 @@ PRODUCT_PACKAGES := \ libOMX.TI.DUCATI1.VIDEO.DECODER.secure \ libOMX.TI.DUCATI1.VIDEO.CAMERA \ libOMX.TI.DUCATI1.MISC.SAMPLE \ + libdrmdecrypt \ libstagefrighthw \ - libI420colorconvert \ + libI420colorconvert \ libtiutils \ libcamera \ libion_ti \ |