summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-05-22 14:36:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-22 14:36:01 -0700
commit94d807c4a2c6d0a8212669a3ca4f5d8a97e8dc04 (patch)
tree0f9f904c8590934bd25fc92c34d996b06a672047
parentd6204cf0bc6fddb04031510cca3cb44b2b4a6d4e (diff)
parent8fa731ddc4e629880eda7f1f69de4fc4556cb7cb (diff)
downloadhardware_ti_omap4xxx-94d807c4a2c6d0a8212669a3ca4f5d8a97e8dc04.zip
hardware_ti_omap4xxx-94d807c4a2c6d0a8212669a3ca4f5d8a97e8dc04.tar.gz
hardware_ti_omap4xxx-94d807c4a2c6d0a8212669a3ca4f5d8a97e8dc04.tar.bz2
am 8fa731dd: Don\'t include widevine proprietary for panda.
* commit '8fa731ddc4e629880eda7f1f69de4fc4556cb7cb': 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 b584385..544ba81 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 \