widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Install proprietary userspace modules under system/vendor. BUG: 5284436"

Browse Source 
This reverts commit 784469b355
This commit is contained in:
Edwin Wong
2011-09-22 17:08:37 -07:00
committed by Android (Google) Code Review
parent 784469b355
commit ceac204c61
3 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proprietary/drmwvmplugin/com.google.widevine.software.drm.xml
View File

@@ -15,5 +15,5 @@
--> -->
<permissions> <permissions>
<library name="com.google.widevine.software.drm" <library name="com.google.widevine.software.drm"
file="/vendor/lib/drm/libdrmwvmplugin.so"/> file="/system/lib/drm/libdrmwvmplugin.so"/>
</permissions> </permissions>

28
proprietary/drmwvmplugin/lib/Android.mk
View File

@@ -4,32 +4,12 @@ LOCAL_PATH:= $(call my-dir)
include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
################################################################################ LOCAL_PREBUILT_LIBS := \
# libwvdrm_L?.so libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL).so \
libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL).a
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_STRIP_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
include $(BUILD_PREBUILT) include $(BUILD_MULTI_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 endif

10
proprietary/streamcontrol/lib/Android.mk
View File

@@ -1,17 +1,15 @@
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)
LOCAL_PATH := $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
LOCAL_MODULE := libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL).so LOCAL_PREBUILT_LIBS := \
LOCAL_MODULE_CLASS := SHARED_LIBRARIES libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL).so
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib
LOCAL_STRIP_MODULE := true LOCAL_STRIP_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
include $(BUILD_PREBUILT) include $(BUILD_MULTI_PREBUILT)
endif endif