From 163d39278f76ecfa5aeb5f3a1835f52568645ba5 Mon Sep 17 00:00:00 2001
From: Bryan Mawhinney <bryanmawhinney@google.com>
Date: Tue, 27 Sep 2011 18:18:19 +0100
Subject: [PATCH] Include a dummy jar in widevine distribution.

This suppresses the errors currently caused by
uses-library pointing to a .so

Bug: 4553918
Change-Id: I646456facae908c7937d4768010aef88d7389eee
---
 proprietary/drmwvmplugin/Android.mk                | 14 ++++++++++++--
 .../com.google.widevine.software.drm.xml           |  2 +-
 proprietary/drmwvmplugin/src/StubLib.java          |  4 ++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 proprietary/drmwvmplugin/src/StubLib.java

diff --git a/proprietary/drmwvmplugin/Android.mk b/proprietary/drmwvmplugin/Android.mk
index 28e9e376..611fcade 100644
--- a/proprietary/drmwvmplugin/Android.mk
+++ b/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
-
-
diff --git a/proprietary/drmwvmplugin/com.google.widevine.software.drm.xml b/proprietary/drmwvmplugin/com.google.widevine.software.drm.xml
index 33d444ff..94274d62 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/framework/com.google.widevine.software.drm.jar"/>
 </permissions>
diff --git a/proprietary/drmwvmplugin/src/StubLib.java b/proprietary/drmwvmplugin/src/StubLib.java
new file mode 100644
index 00000000..f434a16b
--- /dev/null
+++ b/proprietary/drmwvmplugin/src/StubLib.java
@@ -0,0 +1,4 @@
+package com.google.widevine.software.drm;
+
+class StubLib {
+}