diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-05-31 00:02:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-31 00:02:59 +0000 |
| commit | 948d08dcdd0ddaf7fc4122b6a54b451b77e26854 (patch) | |
| tree | c55fcf39c82eebaa35945ee53a668269814c6027 /media | |
| parent | 725010a83f1798e5ba6edb93ca2656a96c29fcae (diff) | |
| parent | d6315a35bfe9c9b6f200abdeed5e711cbe0fe6e0 (diff) | |
| download | frameworks_base-948d08dcdd0ddaf7fc4122b6a54b451b77e26854.zip frameworks_base-948d08dcdd0ddaf7fc4122b6a54b451b77e26854.tar.gz frameworks_base-948d08dcdd0ddaf7fc4122b6a54b451b77e26854.tar.bz2 | |
Merge "Fix name error in com.android.mediadrm.signer.xml" into lmp-preview-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/lib/signer/Android.mk | 3 | ||||
| -rw-r--r-- | media/lib/signer/com.android.mediadrm.signer.xml | 4 |
2 files changed, 4 insertions, 3 deletions
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:= com.android.mediadrm.signer 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) 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> |