diff options
| author | Edwin Wong <edwinwong@google.com> | 2012-08-03 15:52:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-03 15:52:46 -0700 |
| commit | 632a608d94a1c42cd5dd1b36e88b162d8e11ca9a (patch) | |
| tree | 3e7750833edcaa9c91a780a10875a90d2e44cf7f | |
| parent | 7e093dba39ffb912fea76826a96d82bf91008f66 (diff) | |
| parent | 6e18d140dfd80193121abf35764b8dad2f369041 (diff) | |
| download | hardware_ti_omap4xxx-632a608d94a1c42cd5dd1b36e88b162d8e11ca9a.zip hardware_ti_omap4xxx-632a608d94a1c42cd5dd1b36e88b162d8e11ca9a.tar.gz hardware_ti_omap4xxx-632a608d94a1c42cd5dd1b36e88b162d8e11ca9a.tar.bz2 | |
Merge "Revert Widevine 6.0.0 -> 4.5.0 libraries" into jb-mr1-dev
| -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 \ |