summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-08-03 17:10:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-03 17:10:58 -0700
commitf040963b43cd68083536cb514ea030c670b504b0 (patch)
tree4f16b8a6ad5b2db9b2019fcc81b7c00d9c67d108
parent6e18d140dfd80193121abf35764b8dad2f369041 (diff)
downloadhardware_ti_omap4xxx-f040963b43cd68083536cb514ea030c670b504b0.zip
hardware_ti_omap4xxx-f040963b43cd68083536cb514ea030c670b504b0.tar.gz
hardware_ti_omap4xxx-f040963b43cd68083536cb514ea030c670b504b0.tar.bz2
Fix the build.
Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries" This reverts commit 6e18d140dfd80193121abf35764b8dad2f369041 Change-Id: Ia2cb66fc1f88298df675b9085b16c83558dede62
-rw-r--r--libdrmdecrypt/Android.mk32
-rw-r--r--omap4.mk3
2 files changed, 1 insertions, 34 deletions
diff --git a/libdrmdecrypt/Android.mk b/libdrmdecrypt/Android.mk
deleted file mode 100644
index 324221c..0000000
--- a/libdrmdecrypt/Android.mk
+++ /dev/null
@@ -1,32 +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 \
-
-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 614aea6..8bef517 100644
--- a/omap4.mk
+++ b/omap4.mk
@@ -24,9 +24,8 @@ 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 \