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/streamcontrol/lib/Android.mk

@@ -3,15 +3,12 @@ ifeq ($(TARGET_ARCH),arm)
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
+include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
+
+LOCAL_PREBUILT_LIBS := \
+       libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL).so
 
-LOCAL_MODULE := libWVStreamControlAPI
-LOCAL_SRC_FILES := \
-        libWVStreamControlAPI.so
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $(LOCAL_SRC_FILES))
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
-OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)
-include $(BUILD_PREBUILT)
+include $(BUILD_MULTI_PREBUILT)
 
 endif

proprietary/streamcontrol/test/Android.mk

@@ -3,33 +3,34 @@ ifeq ($(TARGET_ARCH),arm)
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
+include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
 
 LOCAL_SRC_FILES:= \
     TestPlayer.cpp
 
-LOCAL_C_INCLUDES+=                                    \
-    bionic                                            \
-    vendor/widevine/proprietary/include               \
-    external/stlport/stlport                          \
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_C_INCLUDES += \
+    bionic \
+    vendor/widevine/proprietary/include \
+    external/stlport/stlport \
     vendor/widevine/proprietary/streamcontrol/include \
-    vendor/widevine/proprietary/drmwvmplugin/include  \
-    frameworks/base/drm/libdrmframework/include       \
+    vendor/widevine/proprietary/drmwvmplugin/include \
+    frameworks/base/drm/libdrmframework/include \
     frameworks/base/drm/libdrmframework/plugins/common/include
 
 LOCAL_SHARED_LIBRARIES := \
-    libstlport            \
-    libWVStreamControlAPI \
-    libdrmframework       \
-    libwvdrm              \
-    liblog                \
-    libutils              \
-    libz                  \
-    libcutils             \
-    libdl
+    libstlport \
+    libdrmframework \
+    liblog \
+    libutils \
+    libz \
+    libcutils \
+    libdl \
+    libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL) \
+    libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL)
 
-LOCAL_MODULE:=test-wvplayer
-
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE:=test-wvplayer_L$(LOCAL_OEMCRYPTO_LEVEL)
 
 include $(BUILD_EXECUTABLE)