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

am: f4710c174f Change-Id: Ia8168af573a5aae66b75c11a2c18fd56e8addae3
2016-07-19 00:32:24 +00:00
parent 8e8bb6633c f4710c174f
commit aa85bf99ee
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