Install proprietary userspace modules under /vendor.

BUG: 5284436

Change-Id: I9921b8446626b7041a3fc66bff918d3adac5bbe1
This commit is contained in:
Edwin Wong
2011-10-12 14:36:21 -07:00
committed by Ying Wang
parent f5fa8f2017
commit 1fee8fd75a
7 changed files with 85 additions and 11 deletions

View File

@@ -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>

View File

@@ -2,14 +2,34 @@ ifeq ($(TARGET_ARCH),arm)
LOCAL_PATH:= $(call my-dir)
#########################################################################
# libwvdrm_L?.so
include $(CLEAR_VARS)
include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
LOCAL_PREBUILT_LIBS := \
libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL).so \
libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL).a
LOCAL_MODULE := libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL)
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_SUFFIX := .so
LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
LOCAL_PROPRIETARY_MODULE := true
LOCAL_STRIP_MODULE := true
LOCAL_MODULE_TAGS := optional
include $(BUILD_MULTI_PREBUILT)
include $(BUILD_PREBUILT)
#########################################################################
# libwvocs_L?.a
include $(CLEAR_VARS)
include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
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

View File

@@ -56,7 +56,7 @@ private:
void WVMDrmPluginTest::Run()
{
cout << "WVDrmPluginTest::Run" << endl;
const char *path = "/system/lib/drm/libdrmwvmplugin.so";
const char *path = "/vendor/lib/drm/libdrmwvmplugin.so";
void *handle = dlopen(path, RTLD_NOW);
if (handle == NULL) {
fprintf(stderr, "Can't open plugin: %s %s\n", path, dlerror());