Merge "Remove libdrmdecrypt from AOSP build."
diff --git a/libdrmdecrypt/Android.mk b/libdrmdecrypt/Android.mk
deleted file mode 100644
index 9bb258f..0000000
--- a/libdrmdecrypt/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-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 \
-
-LOCAL_STATIC_LIBRARIES += \
-        libtee_client_api_driver        \
-
-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 8fc233b..8bef517 100644
--- a/omap4.mk
+++ b/omap4.mk
@@ -24,7 +24,6 @@
 	libOMX.TI.DUCATI1.VIDEO.DECODER.secure \
 	libOMX.TI.DUCATI1.VIDEO.CAMERA \
 	libOMX.TI.DUCATI1.MISC.SAMPLE \
-        libdrmdecrypt \
 	libstagefrighthw \
         libI420colorconvert \
 	libtiutils \