Removed outdated stuff from Android build scripts

diff --git a/android/scripts/build.cmd b/android/scripts/build.cmd
index 4fd32e2..97b9cd9 100644 (file)
--- a/android/scripts/build.cmd
+++ b/android/scripts/build.cmd
@@ -19,7 +19,6 @@ POPD
 IF NOT DEFINED BUILD_DIR SET BUILD_DIR=build\r
 IF NOT DEFINED ARM_TARGET SET ARM_TARGET=armeabi-v7a\r
 SET OPENCV_BUILD_DIR=%SCRIPTS_DIR%\..\%BUILD_DIR%\r
-SET ANDROID_OPENCV_BUILD_DIR=%SCRIPTS_DIR%\..\android-opencv\%BUILD_DIR%\r
 \r
 :: check that all required variables defined\r
 PUSHD .\r
@@ -34,9 +33,6 @@ IF NOT %BUILD_JAVA_PART%==1 GOTO required_variables_checked
 IF NOT DEFINED ANDROID_SDK (ECHO. & ECHO You should set an environment variable ANDROID_SDK to the full path to your copy of Android SDK & GOTO end)\r
 (CD "%ANDROID_SDK%" 2>NUL) || (ECHO. & ECHO Directory "%ANDROID_SDK%" specified by ANDROID_SDK variable does not exist & GOTO end)\r
 \r
-IF NOT DEFINED SWIG_DIR (ECHO. & ECHO You should set an environment variable SWIG_DIR to the full path to SWIG root & GOTO end)\r
-(CD "%SWIG_DIR%" 2>NUL) || (ECHO. & ECHO Directory "%SWIG_DIR%" specified by SWIG_DIR variable does not exist & GOTO end)\r
-\r
 IF NOT DEFINED ANT_DIR (ECHO. & ECHO You should set an environment variable ANT_DIR to the full path to Apache Ant root & GOTO end)\r
 (CD "%ANT_DIR%" 2>NUL) || (ECHO. & ECHO Directory "%ANT_DIR%" specified by ANT_DIR variable does not exist & GOTO end)\r
 \r
@@ -60,7 +56,7 @@ IF NOT %BUILD_OPENCV%==1 GOTO other-cmake
 ("%CMAKE_EXE%" -G"MinGW Makefiles" -DARM_TARGET="%ARM_TARGET%" -C "%SOURCE_DIR%\CMakeCache.android.initial.cmake" -DCMAKE_TOOLCHAIN_FILE="%SOURCE_DIR%"\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM="%MAKE_EXE%" %* "%SOURCE_DIR%\..") && GOTO cmakefin\r
 ECHO. & ECHO cmake failed &    GOTO end\r
 :other-cmake\r
-("%CMAKE_EXE%" -G"MinGW Makefiles" -DARM_TARGET="%ARM_TARGET%" -DOpenCV_DIR="%OPENCV_BUILD_DIR%" -DAndroidOpenCV_DIR="%ANDROID_OPENCV_BUILD_DIR%"  -DCMAKE_PROGRAM_PATH="%SWIG_DIR%" -DCMAKE_TOOLCHAIN_FILE="%OPENCV_BUILD_DIR%\..\android.toolchain.cmake" -DCMAKE_MAKE_PROGRAM="%MAKE_EXE%" %* "%SOURCE_DIR%") && GOTO cmakefin\r
+("%CMAKE_EXE%" -G"MinGW Makefiles" -DARM_TARGET="%ARM_TARGET%" -DOpenCV_DIR="%OPENCV_BUILD_DIR%" -DCMAKE_TOOLCHAIN_FILE="%OPENCV_BUILD_DIR%\..\android.toolchain.cmake" -DCMAKE_MAKE_PROGRAM="%MAKE_EXE%" %* "%SOURCE_DIR%") && GOTO cmakefin\r
 ECHO. & ECHO cmake failed &    GOTO end\r
 :cmakefin\r
 \r

diff --git a/android/scripts/wincfg.cmd.tmpl b/android/scripts/wincfg.cmd.tmpl
index 3ba62a5..f095927 100644 (file)
--- a/android/scripts/wincfg.cmd.tmpl
+++ b/android/scripts/wincfg.cmd.tmpl
@@ -1,11 +1,10 @@
 :: variables required for OpenCV build ::\r
 :: Note: all pathes should be specified without tailing slashes!\r
-SET ANDROID_NDK=C:\full\path\to\your\copy\of\android\NDK\android-ndk-r5c\r
+SET ANDROID_NDK=C:\full\path\to\your\copy\of\android\NDK\android-ndk-r6\r
 SET CMAKE_EXE=C:\full\path\to\cmake\utility\cmake.exe\r
 SET MAKE_EXE=C:\full\path\to\native\port\of\make\utility\make.exe\r
 \r
 :: variables required for android-opencv build ::\r
-SET SWIG_DIR=C:\full\path\to\SWIG\directory\swigwin-2.0.3\r
 SET ANDROID_SDK=C:\full\path\to\your\copy\of\android\SDK\android-sdk-windows\r
 SET ANT_DIR=C:\full\path\to\ant\directory\apache-ant-1.8.2\r
 SET JAVA_HOME=C:\full\path\to\JDK\jdk1.6.0_25\r
@@ -24,4 +23,4 @@ SET BUILD_DIR=build
 ::SET BUILD_DIR=build_neon\r
 \r
 :::: other options\r
-::SET ANDROID_API_LEVEL=8   &:: android-3 is enough for OpenCV but android-8 is recommended\r
+::SET ANDROID_API_LEVEL=8   &:: android-3 is enough for native part of OpenCV but android-8 is required for Java API and samples\r