Use NDK versions of libjpeg and libpng
There's a copy of libjpeg in this makefile already, and the headers are
being used, so use it. Use the static libpng built against the ndk.
Change-Id: Iaf207a213db1862d5511b9d8642bc0a5801c209b
diff --git a/Android.mk b/Android.mk
index 2ba27c6..62b2ef8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -663,8 +663,8 @@
modules/imgcodecs/src/rgbe.cpp \
modules/imgcodecs/src/utils.cpp
-LOCAL_STATIC_LIBRARIES += libopencv_hal libjasper opencv_libjpeg libtiff libIlmImf
-LOCAL_SHARED_LIBRARIES := libopencv_core libopencv_imgproc libpng
+LOCAL_STATIC_LIBRARIES += libopencv_hal libjasper opencv_libjpeg libtiff libIlmImf libpng_ndk
+LOCAL_SHARED_LIBRARIES := libopencv_core libopencv_imgproc
include $(BUILD_SHARED_LIBRARY)
@@ -929,8 +929,8 @@
modules/photo/src/tonemap.cpp \
modules/photo/opencl_kernels_photo.cpp
-LOCAL_SHARED_LIBRARIES := libopencv_core libopencv_imgproc libpng libjpeg
-LOCAL_STATIC_LIBRARIES := libopencv_hal
+LOCAL_SHARED_LIBRARIES := libopencv_core libopencv_imgproc
+LOCAL_STATIC_LIBRARIES := libopencv_hal opencv_libjpeg libpng_ndk
include $(BUILD_SHARED_LIBRARY)
