Merge "Include a dummy jar in widevine distribution."

proprietary/drmwvmplugin/Android.mk

@@ -17,6 +17,18 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
 
 include $(BUILD_PREBUILT)
 
+########################
+# Dummy library used to indicate availability of widevine drm
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := com.google.widevine.software.drm
+LOCAL_SRC_FILES := src/StubLib.java
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+include $(BUILD_JAVA_LIBRARY)
+
 ########################
 
 ifeq ($(TARGET_ARCH),arm)
@@ -37,5 +49,3 @@ include $(BUILD_STATIC_LIBRARY)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
 endif
-
-

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/framework/com.google.widevine.software.drm.jar"/>
 </permissions>

proprietary/drmwvmplugin/src/StubLib.java

@@ -0,0 +1,4 @@
+package com.google.widevine.software.drm;
+
+class StubLib {
+}