From 55b05dab92fbe71781d990880289241bb3e83d3e Mon Sep 17 00:00:00 2001
From: Jeffrey Tinker <jtinker@google.com>
Date: Fri, 18 Mar 2011 10:55:30 -0700
Subject: [PATCH] Provide a default liboemcrypto called liboemstub for devices
 that do not have widevine OEM integration but still build the wv libs.

Change-Id: Iaa577416f3996677af234738ac0cd3344bbee9bc
---
 proprietary/drmwvmplugin/Android.mk           |  20 +++++++++++---
 proprietary/drmwvmplugin/lib/Android.mk       |  25 ++++++++++++++++++
 proprietary/drmwvmplugin/lib/liboemstub.a     | Bin 0 -> 5464 bytes
 .../lib/libwvocs.a                            | Bin
 proprietary/drmwvmplugin/test/Android.mk      |   3 +++
 proprietary/streamcontrol/lib/Android.mk      |  11 +++-----
 proprietary/streamcontrol/test/Android.mk     |   1 +
 proprietary/wvm/Android.mk                    |   4 +--
 proprietary/wvm/test/Android.mk               |   4 +++
 9 files changed, 54 insertions(+), 14 deletions(-)
 create mode 100644 proprietary/drmwvmplugin/lib/Android.mk
 create mode 100644 proprietary/drmwvmplugin/lib/liboemstub.a
 rename proprietary/{streamcontrol => drmwvmplugin}/lib/libwvocs.a (100%)

diff --git a/proprietary/drmwvmplugin/Android.mk b/proprietary/drmwvmplugin/Android.mk
index 7a933e00..9a1714cb 100644
--- a/proprietary/drmwvmplugin/Android.mk
+++ b/proprietary/drmwvmplugin/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -13,8 +15,6 @@ include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 
-ifeq ($(TARGET_ARCH),arm)
-
 LOCAL_SRC_FILES:= \
     src/WVMDrmPlugin.cpp \
     src/WVMLogging.cpp
@@ -31,8 +31,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm
 
 LOCAL_STATIC_LIBRARIES := \
     libdrmframeworkcommon \
-    libwvocs \
-    liboemcrypto
+    libwvocs
 
 LOCAL_SHARED_LIBRARIES := \
     libutils              \
@@ -43,9 +42,19 @@ LOCAL_SHARED_LIBRARIES := \
     libWVStreamControlAPI
 
 ifneq (,$(filter stingray wingray, $(TARGET_DEVICE)))
+
+# stingray/wingray security lib provided by motorola for widevine
+LOCAL_STATIC_LIBRARIES += \
+    liboemcrypto
+
 LOCAL_SHARED_LIBRARIES += \
     libtpa                \
     libtpa_core
+else
+# for devices that don't support WV drm liboemcrypto.a is not provided by the vendor
+# Use liboemstub instead
+LOCAL_STATIC_LIBRARIES += \
+    liboemstub
 endif
 
 ifeq ($(TARGET_SIMULATOR),true)
@@ -65,4 +74,7 @@ LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
+# invoke Android.mk files in subdirs
+include $(call all-makefiles-under,$(LOCAL_PATH))
+
 endif
diff --git a/proprietary/drmwvmplugin/lib/Android.mk b/proprietary/drmwvmplugin/lib/Android.mk
new file mode 100644
index 00000000..877fa1fb
--- /dev/null
+++ b/proprietary/drmwvmplugin/lib/Android.mk
@@ -0,0 +1,25 @@
+ifeq ($(TARGET_ARCH),arm)
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+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)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := liboemstub
+LOCAL_SRC_FILES := \
+        liboemstub.a
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+include $(BUILD_PREBUILT)
+
+endif
\ No newline at end of file
diff --git a/proprietary/drmwvmplugin/lib/liboemstub.a b/proprietary/drmwvmplugin/lib/liboemstub.a
new file mode 100644
index 0000000000000000000000000000000000000000..e45ee7f5bdafaebc6e43b94a583672c1058a901e
GIT binary patch
literal 5464
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

literal 0
HcmV?d00001

diff --git a/proprietary/streamcontrol/lib/libwvocs.a b/proprietary/drmwvmplugin/lib/libwvocs.a
similarity index 100%
rename from proprietary/streamcontrol/lib/libwvocs.a
rename to proprietary/drmwvmplugin/lib/libwvocs.a
diff --git a/proprietary/drmwvmplugin/test/Android.mk b/proprietary/drmwvmplugin/test/Android.mk
index 791c4acf..555ff7a9 100644
--- a/proprietary/drmwvmplugin/test/Android.mk
+++ b/proprietary/drmwvmplugin/test/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -31,3 +33,4 @@ LOCAL_MODULE_TAGS := tests
 
 include $(BUILD_EXECUTABLE)
 
+endif
\ No newline at end of file
diff --git a/proprietary/streamcontrol/lib/Android.mk b/proprietary/streamcontrol/lib/Android.mk
index ec48d023..27d7e722 100644
--- a/proprietary/streamcontrol/lib/Android.mk
+++ b/proprietary/streamcontrol/lib/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -12,11 +14,4 @@ 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)
+endif
diff --git a/proprietary/streamcontrol/test/Android.mk b/proprietary/streamcontrol/test/Android.mk
index d7fdf90a..e37cbebe 100644
--- a/proprietary/streamcontrol/test/Android.mk
+++ b/proprietary/streamcontrol/test/Android.mk
@@ -1,6 +1,7 @@
 ifeq ($(TARGET_ARCH),arm)
 
 LOCAL_PATH:= $(call my-dir)
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
diff --git a/proprietary/wvm/Android.mk b/proprietary/wvm/Android.mk
index 68f8259b..c0136d0a 100644
--- a/proprietary/wvm/Android.mk
+++ b/proprietary/wvm/Android.mk
@@ -1,9 +1,9 @@
+ifeq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-ifeq ($(TARGET_ARCH),arm)
-
 LOCAL_SRC_FILES:=           \
     WVMLogging.cpp          \
     WVMExtractorImpl.cpp    \
diff --git a/proprietary/wvm/test/Android.mk b/proprietary/wvm/test/Android.mk
index dc237def..255c8832 100644
--- a/proprietary/wvm/test/Android.mk
+++ b/proprietary/wvm/test/Android.mk
@@ -1,4 +1,7 @@
+ifeq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
@@ -25,3 +28,4 @@ LOCAL_MODULE_TAGS := tests
 
 include $(BUILD_EXECUTABLE)
 
+endif