diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-06-17 17:22:29 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-06-17 17:22:29 -0700 |
| commit | 6e7a52bc3dd7550053c3b20dabcd31140d25d7f0 (patch) | |
| tree | 1e5913739a35100c083a3a0b6e454b92aab5169f | |
| parent | 7471b1f9dd4250b29574c449be034a76afd52d99 (diff) | |
| download | opencv3-6e7a52bc3dd7550053c3b20dabcd31140d25d7f0.tar.gz | |
Use NDK versions of libjpeg and libpngandroid-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
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
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -663,8 +663,8 @@ LOCAL_SRC_FILES := \ 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 @@ LOCAL_SRC_FILES := \ 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) |