diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-07 00:59:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 00:59:03 +0000 |
| commit | daefb17c2516eae398da989b6b2a368a0b843284 (patch) | |
| tree | 5f92b1c9d7b101d9139dbebf20a1d8e728b5f4df /media | |
| parent | 4395a082d21ac5b05b89100dac9eef40fc244df5 (diff) | |
| parent | e1af0bd8588ca2de7084853017928729a793b769 (diff) | |
| download | frameworks_base-daefb17c2516eae398da989b6b2a368a0b843284.zip frameworks_base-daefb17c2516eae398da989b6b2a368a0b843284.tar.gz frameworks_base-daefb17c2516eae398da989b6b2a368a0b843284.tar.bz2 | |
am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit 'e1af0bd8588ca2de7084853017928729a793b769':
libexif is now libjhead
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 63a61e2..685bbcc 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -37,11 +37,11 @@ LOCAL_SHARED_LIBRARIES := \ libcamera_client \ libmtp \ libusbhost \ - libexif \ + libjhead \ libstagefright_amrnb_common \ LOCAL_REQUIRED_MODULES := \ - libexif_jni + libjhead_jni LOCAL_STATIC_LIBRARIES := \ libstagefright_amrnbenc |