diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-06-21 22:19:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 22:19:30 +0000 |
| commit | 889e7340cd777b98e3cff289da5ae34b3e0f1268 (patch) | |
| tree | 1e5913739a35100c083a3a0b6e454b92aab5169f | |
| parent | ae320ad446d754d85adafdbabc34a3898009701e (diff) | |
| parent | 40f945e5e604c70148e907c43261bbc8f1d69a0f (diff) | |
| download | opencv3-889e7340cd777b98e3cff289da5ae34b3e0f1268.tar.gz | |
Use NDK versions of libjpeg and libpng am: 6e7a52bc3d
am: 40f945e5e6
Change-Id: Ie2182eb7f4f7dac55daf6f70faced1be71989e91
| -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) |