summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred <fredgc@google.com>2012-07-02 16:15:20 -0700
committerFred <fredgc@google.com>2012-07-07 14:22:24 -0700
commited0218a8232c878731fbc5e75fe3477979e4ad17 (patch)
tree0887cf79c1ae67e6101cf5c31cac8e484b3632b3
parentd172f063a16f8d9f562998040131647ecd74c4de (diff)
downloadhardware_ti_omap4-ed0218a8232c878731fbc5e75fe3477979e4ad17.zip
hardware_ti_omap4-ed0218a8232c878731fbc5e75fe3477979e4ad17.tar.gz
hardware_ti_omap4-ed0218a8232c878731fbc5e75fe3477979e4ad17.tar.bz2
Remove libdrmdecrypt from AOSP build.
Not all boards that use the omap4 chipset need to have the drm library. In particular, the panda does not. The libdrmdecrypt make file was moved from hardware/ti/omap4xxx, to vendor/ti/proprietary. The directory libdrmdecrypt was removed in this change, and added in change Icbeb6c5c. The dependency on libdrmdecrypt was removed from omap4.mk and added to tuna_common.mk in change Ia1019321. Change-Id: Iaad4d1122809ad67869d7515c5c5009a048bb1c2
-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 \