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/streamcontrol/include/AndroidHooks.h

@@ -1,35 +1,13 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HOOKS_H
-#define ANDROID_HOOKS_H
-
-typedef void (*AndroidEcmCallout)(char* ecm, unsigned long size);
-
-void AndroidSetEcmCallout(AndroidEcmCallout callout);
-void AndroidProcessEcm(char* ecm, unsigned long size);
-
-typedef int (*AndroidDecryptCallout)(char *in, char *out, int length, char *iv);
-
-void AndroidSetDecryptCallout(AndroidDecryptCallout callout);
-int AndroidDecrypt(char *in, char *out, int length, char *iv);
-bool AndroidHaveKey();
-
-typedef void (*AndroidLogCallout)(const char *msg);
-void AndroidSetLogCallout(AndroidLogCallout callout);
-void AndroidLogDebug(const char *msg);
-
-#endif // ANDROID_HOOKS_H
+typedef void (*_ah001)(char* , unsigned long );
+void _ah002(_ah001 );
+void _ah007(char* , unsigned long );
+typedef int (*_ah003)(char * , char * , int , char * );
+void _ah004(_ah003 );
+void _ah008(char * , char * , int , char * );
+bool _ah009();
+typedef void (*_ah005)(const char * );
+void _ah006(_ah005 );
+void AndroidLogDebug(const char * );
+typedef void (*_ah011)(int );
+void _ah010(_ah011 );
+void libocs_setup();

proprietary/streamcontrol/lib/Android.mk

@@ -11,3 +11,12 @@ LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
 OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libwvocs
+LOCAL_SRC_FILES := \
+        libwvocs.a
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+include $(BUILD_PREBUILT)

proprietary/streamcontrol/test/Android.mk

@@ -2,10 +2,11 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-        TestPlayer.cpp
+    TestPlayer.cpp
 
 LOCAL_C_INCLUDES+=                                    \
     bionic                                            \
+    vendor/widevine/proprietary/include               \
     external/stlport/stlport                          \
     vendor/widevine/proprietary/streamcontrol/include \
     vendor/widevine/proprietary/drmwvmplugin/include
@@ -17,7 +18,8 @@ LOCAL_SHARED_LIBRARIES := \
     libwvdrm              \
     liblog                \
     libutils              \
-    libz
+    libz                  \
+    libcutils
 
 LOCAL_MODULE:=test-wvplayer
 

proprietary/streamcontrol/test/TestPlayer.cpp

@@ -200,8 +200,7 @@ int main( int argc, char *argv[] )
     bool ptsToMediaTime = false;
     string drmUrl = DEFAULT_DRM_URL;
 
-    // Set up callouts
-    AndroidSetLogCallout(PrintMessage);
+    _ah006(PrintMessage);
 
     // Create DRM plugin object
     sDrmPlugin = WVDRMPluginAPI::create();