summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-05-22 14:39:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-22 14:39:57 -0700
commit5cea9942049630f7a188dc304311c0c51fd887c2 (patch)
treec8925977062fe26f8fff61a56285cf9508f85d48
parent6e034e72e637fc8b1c0958f3cc0329e32b131d25 (diff)
parent94d807c4a2c6d0a8212669a3ca4f5d8a97e8dc04 (diff)
downloadhardware_ti_omap4xxx-5cea9942049630f7a188dc304311c0c51fd887c2.zip
hardware_ti_omap4xxx-5cea9942049630f7a188dc304311c0c51fd887c2.tar.gz
hardware_ti_omap4xxx-5cea9942049630f7a188dc304311c0c51fd887c2.tar.bz2
am 94d807c4: am 8fa731dd: Don\'t include widevine proprietary for panda.
* commit '94d807c4a2c6d0a8212669a3ca4f5d8a97e8dc04': Don't include widevine proprietary for panda.
-rw-r--r--libdrmdecrypt/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/libdrmdecrypt/Android.mk b/libdrmdecrypt/Android.mk
index d6fc4a6..18e4acf 100644
--- a/libdrmdecrypt/Android.mk
+++ b/libdrmdecrypt/Android.mk
@@ -3,7 +3,9 @@ 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 \