summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred <fredgc@google.com>2012-07-17 08:42:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-17 08:42:26 -0700
commit741df2bd6f7e1fb0f2ef1194d7cf1325d327d5a4 (patch)
tree4f16b8a6ad5b2db9b2019fcc81b7c00d9c67d108
parent80fba10a860e6c7900367a6a9dfd9bbbe5ef2cd2 (diff)
parent9ca0b752e6b8b091656497c1700f6126a3fdf11b (diff)
downloadhardware_ti_omap4xxx-741df2bd6f7e1fb0f2ef1194d7cf1325d327d5a4.zip
hardware_ti_omap4xxx-741df2bd6f7e1fb0f2ef1194d7cf1325d327d5a4.tar.gz
hardware_ti_omap4xxx-741df2bd6f7e1fb0f2ef1194d7cf1325d327d5a4.tar.bz2
Merge "Remove libdrmdecrypt from AOSP build."
-rw-r--r--libdrmdecrypt/Android.mk29
-rw-r--r--omap4.mk1
2 files changed, 0 insertions, 30 deletions
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 @@ PRODUCT_PACKAGES := \
libOMX.TI.DUCATI1.VIDEO.DECODER.secure \
libOMX.TI.DUCATI1.VIDEO.CAMERA \
libOMX.TI.DUCATI1.MISC.SAMPLE \
- libdrmdecrypt \
libstagefrighthw \
libI420colorconvert \
libtiutils \