Merge \\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\" into mnc-dev am: f4710c174f

am: aa85bf99ee Change-Id: Id8919b1b3375f3a760800dbb45567a6023f4f611
2016-07-19 00:38:54 +00:00
parent 5c6db3af89 aa85bf99ee
commit 452dc91f2d
2 changed files with 2255 additions and 194 deletions
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -42,13 +42,9 @@ LOCAL_SHARED_LIBRARIES := \
    libcamera_client \
    libmtp \
    libusbhost \
-    libjhead \
    libexif \
    libstagefright_amrnb_common

-LOCAL_REQUIRED_MODULES := \
-    libjhead_jni
-
 LOCAL_STATIC_LIBRARIES := \
    libstagefright_amrnbenc