From f27197516105607293709d964bff4d0eabfdd196 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Thu, 22 Sep 2011 17:08:37 -0700
Subject: [PATCH] Revert "Install proprietary userspace modules under
 system/vendor. BUG: 5284436"

This reverts commit 784469b3555693acc4803550fa3ea5746abdc2c9
---
 .../com.google.widevine.software.drm.xml      |  2 +-
 proprietary/drmwvmplugin/lib/Android.mk       | 28 +++----------------
 proprietary/streamcontrol/lib/Android.mk      | 10 +++----
 3 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/proprietary/drmwvmplugin/com.google.widevine.software.drm.xml b/proprietary/drmwvmplugin/com.google.widevine.software.drm.xml
index 33d444ff..e86f6691 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="/vendor/lib/drm/libdrmwvmplugin.so"/>
+            file="/system/lib/drm/libdrmwvmplugin.so"/>
 </permissions>
diff --git a/proprietary/drmwvmplugin/lib/Android.mk b/proprietary/drmwvmplugin/lib/Android.mk
index 8a3f4478..1dd1cbfb 100644
--- a/proprietary/drmwvmplugin/lib/Android.mk
+++ b/proprietary/drmwvmplugin/lib/Android.mk
@@ -4,32 +4,12 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
 
-################################################################################
-# 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_PREBUILT_LIBS := \
+       libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL).so \
+       libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL).a
 LOCAL_STRIP_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
-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)
+include $(BUILD_MULTI_PREBUILT)
 
 endif
diff --git a/proprietary/streamcontrol/lib/Android.mk b/proprietary/streamcontrol/lib/Android.mk
index cb05883a..9fd921e4 100644
--- a/proprietary/streamcontrol/lib/Android.mk
+++ b/proprietary/streamcontrol/lib/Android.mk
@@ -1,17 +1,15 @@
 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_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_PREBUILT_LIBS := \
+       libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL).so
 LOCAL_STRIP_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
+include $(BUILD_MULTI_PREBUILT)
 
 endif