Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7edef088 authored by Keun young Park's avatar Keun young Park Committed by Android Git Automerger
Browse files

am 765d3d13: am fca9ff38: Merge "rename exif to exif_jni due to refactoring in... 

am 765d3d13: am fca9ff38: Merge "rename exif to exif_jni due to refactoring in external/jhead" into jb-dev

* commit '765d3d13':
  rename exif to exif_jni due to refactoring in external/jhead
parents 8d79d272 765d3d13

media/java/android/media/ExifInterface.java

+1 −1
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ LOCAL_SHARED_LIBRARIES := \ 
    libexif \

    libstagefright_amrnb_common \



LOCAL_REQUIRED_MODULES := \

    libexif_jni



LOCAL_STATIC_LIBRARIES := \

    libstagefright_amrnbenc