From e1ad86c1fa5cf43fefd197ef4aa9a9ace33299cf Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Wed, 12 Aug 2015 17:06:36 +0300
Subject: [PATCH] android samples: update way to attach native part of OpenCV

OPENCV_ANDROID_SDK - OpenCV Android SDK location (or OpenCV build dir)
Can be passed via ndk-build parameter or environment variable.
---
 samples/android/face-detection/jni/Android.mk          | 10 +++++++++-
 .../android/tutorial-2-mixedprocessing/jni/Android.mk  | 10 +++++++++-
 samples/android/tutorial-4-opencl/jni/Android.mk       | 10 +++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/samples/android/face-detection/jni/Android.mk b/samples/android/face-detection/jni/Android.mk
index 6b6642602d..0686b22d86 100644
--- a/samples/android/face-detection/jni/Android.mk
+++ b/samples/android/face-detection/jni/Android.mk
@@ -5,7 +5,15 @@ include $(CLEAR_VARS)
 #OPENCV_CAMERA_MODULES:=off
 #OPENCV_INSTALL_MODULES:=off
 #OPENCV_LIB_TYPE:=SHARED
-include ../../sdk/native/jni/OpenCV.mk
+ifdef OPENCV_ANDROID_SDK
+  ifneq ("","$(wildcard $(OPENCV_ANDROID_SDK)/OpenCV.mk)")
+    include ${OPENCV_ANDROID_SDK}/OpenCV.mk
+  else
+    include ${OPENCV_ANDROID_SDK}/sdk/native/jni/OpenCV.mk
+  endif
+else
+  include ../../sdk/native/jni/OpenCV.mk
+endif
 
 LOCAL_SRC_FILES  := DetectionBasedTracker_jni.cpp
 LOCAL_C_INCLUDES += $(LOCAL_PATH)
diff --git a/samples/android/tutorial-2-mixedprocessing/jni/Android.mk b/samples/android/tutorial-2-mixedprocessing/jni/Android.mk
index 18dac1fb09..6cd88bd7cf 100644
--- a/samples/android/tutorial-2-mixedprocessing/jni/Android.mk
+++ b/samples/android/tutorial-2-mixedprocessing/jni/Android.mk
@@ -2,7 +2,15 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include ../../sdk/native/jni/OpenCV.mk
+ifdef OPENCV_ANDROID_SDK
+  ifneq ("","$(wildcard $(OPENCV_ANDROID_SDK)/OpenCV.mk)")
+    include ${OPENCV_ANDROID_SDK}/OpenCV.mk
+  else
+    include ${OPENCV_ANDROID_SDK}/sdk/native/jni/OpenCV.mk
+  endif
+else
+  include ../../sdk/native/jni/OpenCV.mk
+endif
 
 LOCAL_MODULE    := mixed_sample
 LOCAL_SRC_FILES := jni_part.cpp
diff --git a/samples/android/tutorial-4-opencl/jni/Android.mk b/samples/android/tutorial-4-opencl/jni/Android.mk
index 7a1a6b5ced..63b79935e8 100644
--- a/samples/android/tutorial-4-opencl/jni/Android.mk
+++ b/samples/android/tutorial-4-opencl/jni/Android.mk
@@ -3,10 +3,14 @@ LOCAL_PATH := $(call my-dir)
 # add OpenCV
 include $(CLEAR_VARS)
 OPENCV_INSTALL_MODULES:=on
-ifeq ($(O4A_SDK_ROOT),)
-    include ../../sdk/native/jni/OpenCV.mk
+ifdef OPENCV_ANDROID_SDK
+  ifneq ("","$(wildcard $(OPENCV_ANDROID_SDK)/OpenCV.mk)")
+    include ${OPENCV_ANDROID_SDK}/OpenCV.mk
+  else
+    include ${OPENCV_ANDROID_SDK}/sdk/native/jni/OpenCV.mk
+  endif
 else
-    include $(O4A_SDK_ROOT)/sdk/native/jni/OpenCV.mk
+  include ../../sdk/native/jni/OpenCV.mk
 endif
 
 # add OpenCL