From 784469b3555693acc4803550fa3ea5746abdc2c9 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Thu, 15 Sep 2011 10:03:53 -0700
Subject: [PATCH] Install proprietary userspace modules under system/vendor.
 BUG: 5284436

Change-Id: Ib338b4665a086abde83028a78f51372275ca83b7
---
 .../com.google.widevine.software.drm.xml      |  2 +-
 proprietary/drmwvmplugin/lib/Android.mk       | 28 ++++++++++++++++---
 proprietary/streamcontrol/lib/Android.mk      | 10 ++++---
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/proprietary/drmwvmplugin/com.google.widevine.software.drm.xml b/proprietary/drmwvmplugin/com.google.widevine.software.drm.xml
index e86f6691..33d444ff 100644
--- a/proprietary/drmwvmplugin/com.google.widevine.software.drm.xml
+++ b/proprietary/drmwvmplugin/com.google.widevine.software.drm.xml
@@ -15,5 +15,5 @@
 -->
 <permissions>
     <library name="com.google.widevine.software.drm"
-            file="/system/lib/drm/libdrmwvmplugin.so"/>
+            file="/vendor/lib/drm/libdrmwvmplugin.so"/>
 </permissions>
diff --git a/proprietary/drmwvmplugin/lib/Android.mk b/proprietary/drmwvmplugin/lib/Android.mk
index 1dd1cbfb..8a3f4478 100644
--- a/proprietary/drmwvmplugin/lib/Android.mk
+++ b/proprietary/drmwvmplugin/lib/Android.mk
@@ -4,12 +4,32 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
 
-LOCAL_PREBUILT_LIBS := \
-       libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL).so \
-       libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL).a
+################################################################################
+# libwvdrm_L?.so
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL).so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+
+LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib
 LOCAL_STRIP_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
-include $(BUILD_MULTI_PREBUILT)
+include $(BUILD_PREBUILT)
+
+################################################################################
+# libwvocs_L?.a
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL)
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
+
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_PREBUILT)
 
 endif
diff --git a/proprietary/streamcontrol/lib/Android.mk b/proprietary/streamcontrol/lib/Android.mk
index 9fd921e4..cb05883a 100644
--- a/proprietary/streamcontrol/lib/Android.mk
+++ b/proprietary/streamcontrol/lib/Android.mk
@@ -1,15 +1,17 @@
 ifeq ($(TARGET_ARCH),arm)
 
-LOCAL_PATH:= $(call my-dir)
+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_L$(LOCAL_OEMCRYPTO_LEVEL).so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib
 LOCAL_STRIP_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
-include $(BUILD_MULTI_PREBUILT)
+include $(BUILD_PREBUILT)
 
 endif