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

media/java/android/media/ExifInterface.java

@@ -98,7 +98,7 @@ public class ExifInterface {
     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

@@ -37,6 +37,9 @@ LOCAL_SHARED_LIBRARIES := \
     libexif \
     libstagefright_amrnb_common \
 
+LOCAL_REQUIRED_MODULES := \
+    libexif_jni
+
 LOCAL_STATIC_LIBRARIES := \
     libstagefright_amrnbenc