Some restructuring of the build was required to support the different

OEM security levels used on tuna vs stingray & crespo. This is part of
the work for b/4598045 Implementing secure video path on TI OMAP4 chip
for ICS.

The Widevine libraries included here, 4.5.0.4321 also contain a fix
for b/4400696 Pinning and unpinning multiple movie for download behavior
is not uniform for multiple tries.

Change-Id: I67f34c06a0353ac7f401f55c1ed4fc2493bc8ab7

proprietary/wvm/Android.mk

@@ -3,8 +3,11 @@ ifeq ($(TARGET_ARCH),arm)
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
+include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
 
+ifeq ($(LOCAL_OEMCRYPTO_LEVEL),1)
 LOCAL_CFLAGS := -DREQUIRE_SECURE_BUFFERS
+endif
 
 LOCAL_SRC_FILES:=           \
     WVMLogging.cpp          \
@@ -21,14 +24,14 @@ LOCAL_C_INCLUDES:=                      \
     vendor/widevine/proprietary/streamcontrol/include \
     vendor/widevine/proprietary/wvm/include
 
-LOCAL_SHARED_LIBRARIES :=    \
-    libstlport               \
-    libstagefright           \
-    libWVStreamControlAPI    \
-    libdrmframework          \
-    libcutils                \
-    liblog                   \
-    libutils                 \
+LOCAL_SHARED_LIBRARIES := \
+    libstlport \
+    libstagefright \
+    libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL) \
+    libdrmframework \
+    libcutils \
+    liblog \
+    libutils \
     libz
 
 LOCAL_MODULE := libwvm