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

am: 452dc91f2d Change-Id: Ie64f0351a6cf2e4b07bffd85c6dbbd9d7239ce32
2016-07-19 00:46:16 +00:00
parent e1d8b98189 452dc91f2d
commit f78637ff64
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