diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 31769798..00000000 --- a/Android.mk +++ /dev/null @@ -1 +0,0 @@ -#include $(call all-subdir-makefiles) diff --git a/debuglibs.sh b/debuglibs.sh deleted file mode 100755 index d048c026..00000000 --- a/debuglibs.sh +++ /dev/null @@ -1,6 +0,0 @@ -# Run this script to install the Widevine shared libs (use debug libs) into the symbols path so -# vendor/google/tools/stack can find them. -# -#!/bin/bash -cp /master/vendor/widevine/proprietary/lib/libWVStreamControlAPI.so /master/out/target/product/stingray/symbols/system/lib/libWVStreamControlAPI.so -cp /master/vendor/widevine/proprietary/lib/libwvdrm.so /master/out/target/product/stingray/symbols/system/lib/libwvdrm.so diff --git a/mkall.sh b/mkall.sh deleted file mode 100644 index 03bb9fa4..00000000 --- a/mkall.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -cd /master/vendor/widevine -mm . -cd /master/frameworks/base/drm/libdrmframework/plugins/widevine -mm . -cd /master/frameworks/base/drm/libdrmframework/plugins/widevine/test -mm . -cd /master/frameworks/base/media/libwvm -mm . -cd /master/frameworks/base/media/libwvm/test -mm . -cd /master/vendor/widevine -adb sync - diff --git a/proprietary/drmwvmplugin/Android.mk b/proprietary/drmwvmplugin/Android.mk index 26a77073..73379be5 100644 --- a/proprietary/drmwvmplugin/Android.mk +++ b/proprietary/drmwvmplugin/Android.mk @@ -1,8 +1,24 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +ifeq ($(TARGET_ARCH),arm) + +LOCAL_MODULE := libwvdrm +LOCAL_SRC_FILES := \ + lib/libwvdrm.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := $(suffix $(LOCAL_SRC_FILES)) +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) +OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES) +include $(BUILD_PREBUILT) + +endif + ######################## # Feature file for clients to look up widevine drm plug-in + +include $(CLEAR_VARS) LOCAL_MODULE := com.google.widevine.software.drm.xml LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_TAGS := optional @@ -19,79 +35,17 @@ include $(BUILD_PREBUILT) ifeq ($(TARGET_ARCH),arm) -#LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := libwvdrm -LOCAL_SRC_FILES := \ - lib/libwvdrm.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := $(suffix $(LOCAL_SRC_FILES)) -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) -OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES) -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) +include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/common.mk LOCAL_SRC_FILES:= \ src/WVMDrmPlugin.cpp \ src/WVMLogging.cpp -LOCAL_C_INCLUDES:= \ - bionic \ - bionic/libstdc++/include \ - external/stlport/stlport \ - vendor/widevine/proprietary/streamcontrol/include \ - vendor/widevine/proprietary/drmwvmplugin/include - -LOCAL_MODULE := libdrmwvmplugin -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm - -LOCAL_STATIC_LIBRARIES := \ - libdrmframeworkcommon \ - libwvocs - -LOCAL_SHARED_LIBRARIES := \ - libutils \ - libcutils \ - libstlport \ - libz \ - libwvdrm \ - 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) - LOCAL_LDLIBS += -ldl -else - LOCAL_SHARED_LIBRARIES += libdl -endif - - - -LOCAL_C_INCLUDES += \ - $(TOP)/frameworks/base/drm/libdrmframework/include \ - $(TOP)/frameworks/base/drm/libdrmframework/plugins/common/include \ - $(TOP)/frameworks/base/include - +LOCAL_MODULE := libdrmwvmcommon LOCAL_MODULE_TAGS := optional -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) # invoke Android.mk files in subdirs include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/proprietary/drmwvmplugin/common.mk b/proprietary/drmwvmplugin/common.mk new file mode 100644 index 00000000..aebe580f --- /dev/null +++ b/proprietary/drmwvmplugin/common.mk @@ -0,0 +1,10 @@ +LOCAL_C_INCLUDES:= \ + $(TOP)/bionic \ + $(TOP)/bionic/libstdc++/include \ + $(TOP)/external/stlport/stlport \ + $(TOP)/vendor/widevine/proprietary/streamcontrol/include \ + $(TOP)/vendor/widevine/proprietary/drmwvmplugin/include \ + $(TOP)/frameworks/base/drm/libdrmframework/include \ + $(TOP)/frameworks/base/drm/libdrmframework/plugins/common/include \ + $(TOP)/frameworks/base/include + diff --git a/proprietary/drmwvmplugin/plugin-core.mk b/proprietary/drmwvmplugin/plugin-core.mk new file mode 100644 index 00000000..25f5e34b --- /dev/null +++ b/proprietary/drmwvmplugin/plugin-core.mk @@ -0,0 +1,25 @@ +# +# To be included by platform-specific vendor Android.mk to build +# Widevine DRM plugin. Sets up includes and defines the core libraries +# required to build the plugin. +# +include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/common.mk + +LOCAL_STATIC_LIBRARIES := \ + libdrmframeworkcommon \ + libdrmwvmcommon \ + libwvocs + +LOCAL_SHARED_LIBRARIES := \ + libutils \ + libcutils \ + libstlport \ + libz \ + libwvdrm \ + libWVStreamControlAPI + +ifeq ($(TARGET_SIMULATOR),true) + LOCAL_LDLIBS += -ldl +else + LOCAL_SHARED_LIBRARIES += libdl +endif diff --git a/putlibs.sh b/putlibs.sh deleted file mode 100755 index e6d2e7ed..00000000 --- a/putlibs.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# This is a script to install the original DRM plugins (first working stingray libs) -# on the device. You shouldn't need to use it except for troubleshooting/debugging. - -adb root -sleep 2 -adb remount -sleep 2 -adb push libwvm.so /system/lib -adb shell mkdir -p /system/lib/drm/plugins/native -adb push libdrmwvmplugin.so /system/lib/drm/plugins/native -adb reboot