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

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

proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp

@@ -66,7 +66,8 @@ WVMDrmPlugin::~WVMDrmPlugin() {
  */
 status_t WVMDrmPlugin::onInitialize(int uniqueId) {
     //LOGD("WVMDrmPlugin::onInitialize : %d", uniqueId);
-    AndroidSetLogCallout(android_printbuf);
+    _ah006(android_printbuf);
+    libocs_setup();
     return DRM_NO_ERROR;
 }
 

proprietary/drmwvmplugin/test/Android.mk

@@ -7,6 +7,7 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_C_INCLUDES+= \
     bionic \
+    vendor/widevine/proprietary/include \
     vendor/widevine/proprietary/drmwvmplugin/include \
     vendor/widevine/proprietary/streamcontrol/include \
     external/stlport/stlport \