Merge pull request #8900 from alalek:update_android_build
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 23 Jun 2017 10:58:52 +0000 (10:58 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 23 Jun 2017 10:58:53 +0000 (10:58 +0000)
commitfa7e7e0ff906cdd2583506ff73b83f155a598a1b
tree676720056919a709ca308c19569dd4ffcbbf36d4
parent259147e32c2878a0dce8054c9512d1a79460733d
parent3e3e2dd51254da177e83e53b1afe3e09a5e821e7
Merge pull request #8900 from alalek:update_android_build
CMakeLists.txt
cmake/OpenCVUtils.cmake
modules/core/CMakeLists.txt
modules/imgcodecs/CMakeLists.txt