commit 8f3ee7df068cf00957f6a96ee67e5a4d2b825d17
author Jeff Tinker <jtinker@google.com> Sat May 31 00:08:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat May 31 00:08:28 2014 +0000
tree 603dc724ec6fd61e07c96ecea1fff0dbee3029f7
parent 00fcdc1236a8730d4c69c779a92b2c20cdb54be6
parent 948d08dcdd0ddaf7fc4122b6a54b451b77e26854

am d99ebf8b: Merge "Fix name error in com.android.mediadrm.signer.xml" into lmp-preview-dev

* commit 'd99ebf8bc7aaadeb006bfd47e4adc05d9b4e4564':
  Fix name error in com.android.mediadrm.signer.xml

media/lib/signer/Android.mk

diff --git a/media/lib/signer/Android.mk b/media/lib/signer/Android.mk
index bca643a..b0d3177 100644
--- a/media/lib/signer/Android.mk
+++ b/media/lib/signer/Android.mk
@@ -23,7 +23,8 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := \
-            $(call all-java-files-under, java)
+            $(call all-java-files-under, java) \
+            $(call all-aidl-files-under, java)
 
 include $(BUILD_JAVA_LIBRARY)
 

media/lib/signer/com.android.mediadrm.signer.xml

diff --git a/media/lib/signer/com.android.mediadrm.signer.xml b/media/lib/signer/com.android.mediadrm.signer.xml
index b5b1f09..fd3a115 100644
--- a/media/lib/signer/com.android.mediadrm.signer.xml
+++ b/media/lib/signer/com.android.mediadrm.signer.xml
@@ -15,6 +15,6 @@
 -->
 
 <permissions>
-    <library name="com.android.media.drm.signer"
-            file="/system/framework/com.android.media.drm.signer.jar" />
+    <library name="com.android.mediadrm.signer"
+            file="/system/framework/com.android.mediadrm.signer.jar" />
 </permissions>