Integration with moto secure keybox storage and add obfuscation of security-related symbols (3513413, 4083757). Also 3481645 - log spam and 3302187 - error handling

Change-Id: Ic11ed7ad57717e88b6f0f2991d8bbb9e1251d546
2011-03-11 13:33:13 -08:00
parent 007788f060
commit 3a1e0f3768
15 changed files with 72 additions and 55 deletions
--- a/proprietary/drmwvmplugin/Android.mk
+++ b/proprietary/drmwvmplugin/Android.mk
@@ -30,7 +30,9 @@ LOCAL_MODULE := libdrmwvmplugin
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm

 LOCAL_STATIC_LIBRARIES := \
-    libdrmframeworkcommon
+    libdrmframeworkcommon \
+    libwvocs \
+    liboemcrypto

 LOCAL_SHARED_LIBRARIES := \
    libutils              \
@@ -40,6 +42,12 @@ LOCAL_SHARED_LIBRARIES := \
    libwvdrm              \
    libWVStreamControlAPI

+ifeq ($(TARGET_DEVICE),stingray)
+LOCAL_SHARED_LIBRARIES += \
+    libtpa                \
+    libtpa_core
+endif
+
 ifeq ($(TARGET_SIMULATOR),true)
 LOCAL_LDLIBS += -ldl
 else