Merge "Revert Widevine 6.0.0 -> 4.5.0 libraries" into jb-mr1-dev
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
diff --git a/omap4.mk b/omap4.mk
index 8bef517..614aea6 100644
--- a/omap4.mk
+++ b/omap4.mk
@@ -24,8 +24,9 @@
libOMX.TI.DUCATI1.VIDEO.DECODER.secure \
libOMX.TI.DUCATI1.VIDEO.CAMERA \
libOMX.TI.DUCATI1.MISC.SAMPLE \
+ libdrmdecrypt \
libstagefrighthw \
- libI420colorconvert \
+ libI420colorconvert \
libtiutils \
libcamera \
libion_ti \
