From bb52c49c9aab2357100b18e72395c1dc3539dfa7 Mon Sep 17 00:00:00 2001
From: Keun young Park <keunyoung@google.com>
Date: Wed, 6 Jun 2012 18:14:50 -0700
Subject: [PATCH] rename exif to exif_jni due to refactoring in external/jhead

- also pull libexif_jni from media_jni

Bug: 6623618
Change-Id: I4f06a4614c5fddcf98d95caff16a2c40f345dade
---
 media/java/android/media/ExifInterface.java | 2 +-
 media/jni/Android.mk                        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 9d6c9f6c0466f..3147ea5504c83 100644
--- 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
index 98e1bc5733ae0..6294704dcf1db 100644
--- 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