diff options
author | Jeff Tinker <jtinker@google.com> | 2012-05-01 15:14:05 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-01 15:14:05 -0700 |
commit | ef5f1c59ff671c53116619262a9f5a8b9cf28bc0 (patch) | |
tree | 286efe83d88074551bb3ba89e881a031eb6fb6b9 | |
parent | 80f21d5d3ff761d2905d99548c2e6f1bab078eae (diff) | |
parent | ae394d8c4b302c62d86020f7c4c9b8eac9011fd2 (diff) | |
download | omap4xxx-omapzoom-ef5f1c59ff671c53116619262a9f5a8b9cf28bc0.tar.gz |
Merge "Build libdrmdecrypt by linking against new wv static library." into jb-dev
-rw-r--r-- | libdrmdecrypt/Android.mk | 29 | ||||
-rw-r--r-- | libdrmdecrypt/crypto.cpp | 7 | ||||
-rw-r--r-- | omap4.mk | 1 |
3 files changed, 37 insertions, 0 deletions
diff --git a/libdrmdecrypt/Android.mk b/libdrmdecrypt/Android.mk new file mode 100644 index 00000000..a170bf90 --- /dev/null +++ b/libdrmdecrypt/Android.mk @@ -0,0 +1,29 @@ +ifeq ($(TARGET_BOARD_PLATFORM),omap4) + +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +-include $(TOP)/vendor/widevine/proprietary/cryptoPlugin/decrypt-core.mk + +LOCAL_SRC_FILES := \ + crypto.cpp + +LOCAL_C_INCLUDES:= \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/vendor/widevine/proprietary/cryptoPlugin \ + +LOCAL_STATIC_LIBRARIES := \ + liboemcrypto \ + libtee_client_api_driver \ + +LOCAL_SHARED_LIBRARIES := \ + libstagefright_foundation \ + liblog \ + +LOCAL_MODULE := libdrmdecrypt + +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) + +endif diff --git a/libdrmdecrypt/crypto.cpp b/libdrmdecrypt/crypto.cpp new file mode 100644 index 00000000..511f72f4 --- /dev/null +++ b/libdrmdecrypt/crypto.cpp @@ -0,0 +1,7 @@ +#include <media/hardware/CryptoAPI.h> + +#include "WVCryptoPlugin.h" + +android::CryptoFactory *createCryptoFactory() { + return new android::WVCryptoFactory; +} @@ -24,6 +24,7 @@ PRODUCT_PACKAGES := \ libOMX.TI.DUCATI1.VIDEO.DECODER.secure \ libOMX.TI.DUCATI1.VIDEO.CAMERA \ libOMX.TI.DUCATI1.MISC.SAMPLE \ + libdrmdecrypt \ libstagefrighthw \ libI420colorconvert \ libtiutils \ |