From b542a38a01f297fc1eea04bc080bc02804601db3 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 25 Jul 2011 11:18:48 +0000 Subject: [PATCH] Fixed camera libs setting in Android.mk --- OpenCV.mk.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/OpenCV.mk.in b/OpenCV.mk.in index 275b8e56f..e9c8ccf69 100644 --- a/OpenCV.mk.in +++ b/OpenCV.mk.in @@ -14,11 +14,7 @@ OPENCV_MODULES := contrib calib3d objdetect features2d imgproc video highgui ml ifeq (${OPENCV_CAMERA_MODULES},off) OPENCV_CAMERA_MODULES:= else - ifeq ($(TARGET_ARCH_ABI),armeabi) - OPENCV_CAMERA_MODULES:= - else - OPENCV_CAMERA_MODULES:=@CMAKE_CAMERA_LIBS_CONFIGCMAKE@ - endif + OPENCV_CAMERA_MODULES:=@CMAKE_CAMERA_LIBS_CONFIGCMAKE@ endif OPENCV_LIB_TYPE:=@OPENCV_LIBTYPE_CONFIGMAKE@