Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Keun young Park
2012-06-07 16:19:02 -07:00
committed by Android (Google) Code Review
parent 839fd4144e bb52c49c9a
commit fca9ff3871
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/ExifInterface.java
View File

@@ -98,7 +98,7 @@ public class ExifInterface {
private static SimpleDateFormat sFormatter; private static SimpleDateFormat sFormatter;
static { static {
System.loadLibrary("exif"); System.loadLibrary("exif_jni");
sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss"); sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
sFormatter.setTimeZone(TimeZone.getTimeZone("UTC")); sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
} }

3
media/jni/Android.mk
View File

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