diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-07 18:31:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 18:31:01 +0000 |
| commit | 6087c51da80510e95549f5887d35bfbfa44af3c6 (patch) | |
| tree | ffb3976a745a9d39a83831365ccb3212a5433d86 /media/jni | |
| parent | 94c349d8165db57a6484a5ea95965c38f67a588f (diff) | |
| parent | 4f36104f06755dc2c95b3d7c8bac5312d7572199 (diff) | |
| download | frameworks_base-6087c51da80510e95549f5887d35bfbfa44af3c6.zip frameworks_base-6087c51da80510e95549f5887d35bfbfa44af3c6.tar.gz frameworks_base-6087c51da80510e95549f5887d35bfbfa44af3c6.tar.bz2 | |
am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '4f36104f06755dc2c95b3d7c8bac5312d7572199':
libexif is now libjhead
Diffstat (limited to 'media/jni')
| -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 |