commit fca9ff387178b4d3c4205427e2d52ef4a5996fe2
author Keun young Park <keunyoung@google.com> Thu Jun 07 16:19:02 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 07 16:19:02 2012 -0700
tree e823866d960306aac422d9be7d8e50f890fe7554
parent 839fd4144e369a9bde4fff4a5a2b6cc9e078cef8
parent bb52c49c9aab2357100b18e72395c1dc3539dfa7

Merge "rename exif to exif_jni due to refactoring in external/jhead" into jb-dev

media/java/android/media/ExifInterface.java

diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 9d6c9f6..3147ea5 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -98,7 +98,7 @@
     private static SimpleDateFormat sFormatter;
 
     static {
-        System.loadLibrary("exif");
+        System.loadLibrary("exif_jni");
         sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
         sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
     }

media/jni/Android.mk

diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index 98e1bc5..6294704 100644
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -37,6 +37,9 @@
     libexif \
     libstagefright_amrnb_common \
 
+LOCAL_REQUIRED_MODULES := \
+    libexif_jni
+
 LOCAL_STATIC_LIBRARIES := \
     libstagefright_amrnbenc