Merge "Restructured libwvm.so build. It is now built under vendor/device/.../liboemcrypto/ because of dependencies on liboemcrypto.a, which cannot be linked by platform-independant code."

proprietary/wvm/Android.mk

@@ -3,6 +3,7 @@ ifeq ($(TARGET_ARCH),arm)
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
+include $(TOP)/vendor/widevine/proprietary/wvm/common.mk
 include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
 
 ifeq ($(LOCAL_OEMCRYPTO_LEVEL),1)
@@ -16,30 +17,9 @@ LOCAL_SRC_FILES:=           \
     WVMMediaSource.cpp      \
     WVMInfoListener.cpp
 
-LOCAL_C_INCLUDES:=                      \
-    bionic                              \
-    bionic/libstdc++                    \
-    external/stlport/stlport            \
-    frameworks/base/media/libstagefright/include \
-    vendor/widevine/proprietary/streamcontrol/include \
-    vendor/widevine/proprietary/wvm/include
-
-LOCAL_SHARED_LIBRARIES := \
-    libstlport \
-    libstagefright \
-    libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL) \
-    libdrmframework \
-    libcutils \
-    liblog \
-    libutils \
-    libz
-
-LOCAL_MODULE := libwvm
-
+LOCAL_MODULE := libwvmcommon
 LOCAL_MODULE_TAGS := optional
 
-
-
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 
 endif

proprietary/wvm/common.mk

@@ -0,0 +1,8 @@
+LOCAL_C_INCLUDES:=                      \
+    bionic                              \
+    bionic/libstdc++                    \
+    external/stlport/stlport            \
+    frameworks/base/media/libstagefright/include \
+    vendor/widevine/proprietary/streamcontrol/include \
+    vendor/widevine/proprietary/wvm/include
+

proprietary/wvm/wvm-core.mk

@@ -0,0 +1,21 @@
+#
+#  To be included by platform-specific vendor Android.mk to build
+#  Widevine wvm static library.  Sets up includes and defines the core libraries
+#  required.
+#
+include $(TOP)/vendor/widevine/proprietary/wvm/common.mk
+include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+    libwvmcommon
+
+LOCAL_SHARED_LIBRARIES := \
+    libstlport \
+    libstagefright \
+    libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL) \
+    libdrmframework \
+    libcutils \
+    liblog \
+    libutils \
+    libz
+