potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Android samples are included into the Android package

Browse Source
This commit is contained in:
Andrey Kamaev
2011-07-14 09:34:57 +00:00
parent a70f354c0f
commit 20ec29f22e
4 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/android/2-native/jni/Android.mk
+4 -3
View File
@@ -2,11 +2,12 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
OPENCV_MK_BUILD_PATH:=../../../../android/build/OpenCV.mk
ifeq ("$(wildcard $(OPENCV_MK_BUILD_PATH))","")
include ../includeOpenCV.mk
ifeq ("$(wildcard $(OPENCV_MK_PATH))","")
#try to load OpenCV.mk from default install location
include $(TOOLCHAIN_PREBUILT_ROOT)/user/share/OpenCV/OpenCV.mk
else
include $(OPENCV_MK_BUILD_PATH)
include $(OPENCV_MK_PATH)
endif
LOCAL_MODULE := native_sample
samples/android/4-mixed/jni/Android.mk
+4 -3
View File
@@ -3,11 +3,12 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
OPENCV_CAMERA_MODULES:=off
OPENCV_MK_BUILD_PATH:=../../../../android/build/OpenCV.mk
ifeq ("$(wildcard $(OPENCV_MK_BUILD_PATH))","")
include ../includeOpenCV.mk
ifeq ("$(wildcard $(OPENCV_MK_PATH))","")
#try to load OpenCV.mk from default install location
include $(TOOLCHAIN_PREBUILT_ROOT)/user/share/OpenCV/OpenCV.mk
else
include $(OPENCV_MK_BUILD_PATH)
include $(OPENCV_MK_PATH)
endif
LOCAL_MODULE := mixed_sample
samples/android/includeOpenCV.mk
+1
View File
@@ -0,0 +1 @@
OPENCV_MK_PATH:=../../../android/build/OpenCV.mk