| commit | 938cab476d8ed97f4a3b81f9fe44698037a46c6e | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Wed May 23 07:02:54 2012 -0700 |
| committer | The Android Automerger <android-build@android.com> | Wed May 23 07:02:54 2012 -0700 |
| tree | 0f9f904c8590934bd25fc92c34d996b06a672047 | |
| parent | 8fa731ddc4e629880eda7f1f69de4fc4556cb7cb [diff] | |
| parent | 1902292f48ff88056bd3b83a3cd5ba7503fd7799 [diff] |
merge in jb-release history after reset to jb-dev
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 @@ 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 \