From 9ca0b752e6b8b091656497c1700f6126a3fdf11b Mon Sep 17 00:00:00 2001 From: Fred Date: Mon, 2 Jul 2012 16:15:20 -0700 Subject: 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 --- libdrmdecrypt/Android.mk | 29 ----------------------------- omap4.mk | 1 - 2 files changed, 30 deletions(-) delete mode 100644 libdrmdecrypt/Android.mk 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 \ -- cgit v1.1