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

Keun young Park · Android (Google) Code Review · commit fca9ff387178 · 2012-06-07T16:19:02.000-07:00
diff --git a/media/java/android/media/ExifInterface.java b/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"));
     }
diff --git a/media/jni/Android.mk b/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
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public class ExifInterface {`
`98`	`98`	`private static SimpleDateFormat sFormatter;`
`99`	`99`
`100`	`100`	`static {`
`101`		`- System.loadLibrary("exif");`
	`101`	`+ System.loadLibrary("exif_jni");`
`102`	`102`	`sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");`
`103`	`103`	`sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));`
`104`	`104`	`}`