diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-07 00:38:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 00:38:48 +0000 |
| commit | 4f36104f06755dc2c95b3d7c8bac5312d7572199 (patch) | |
| tree | 0d18f71cece9b63542b126567751baf41776586e | |
| parent | 1276295b6b157b583480fbdf2be72b9bc0fb1c54 (diff) | |
| parent | e29c96e7ae96f3b94937ea86ffcc0d4d1e930248 (diff) | |
| download | frameworks_base-4f36104f06755dc2c95b3d7c8bac5312d7572199.zip frameworks_base-4f36104f06755dc2c95b3d7c8bac5312d7572199.tar.gz frameworks_base-4f36104f06755dc2c95b3d7c8bac5312d7572199.tar.bz2 | |
am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit 'e29c96e7ae96f3b94937ea86ffcc0d4d1e930248':
libexif is now libjhead
| -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 |