From: Andrey Kamaev <no@email>
Date: Fri, 24 Feb 2012 09:39:28 +0000 (+0000)
Subject: Windows build scripts for Android are updated for SDK r14 and newer
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~5471
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=228b87250a14f859dbc453c4434c90c4bfea967a;p=platform%2Fupstream%2Fopencv.git

Windows build scripts for Android are updated for SDK r14 and newer
---

diff --git a/android/scripts/build.cmd b/android/scripts/build.cmd
index 9f4171d..493fa50 100644
--- a/android/scripts/build.cmd
+++ b/android/scripts/build.cmd
@@ -73,7 +73,7 @@ ECHO. & ECHO Updating Android project...
 
 :: compile java part
 ECHO. & ECHO Compiling Android project...
-(CALL "%ANT_DIR%\bin\ant" compile) || (ECHO. & ECHO failed to compile android project & GOTO end)
+(CALL "%ANT_DIR%\bin\ant" debug) || (ECHO. & ECHO failed to compile android project & GOTO end)
 
 :end
 POPD
diff --git a/android/scripts/wincfg.cmd.tmpl b/android/scripts/wincfg.cmd.tmpl
index 20404ec..f4168f5 100644
--- a/android/scripts/wincfg.cmd.tmpl
+++ b/android/scripts/wincfg.cmd.tmpl
@@ -1,6 +1,6 @@
 :: variables required for OpenCV build ::
 :: Note: all pathes should be specified without tailing slashes!
-SET ANDROID_NDK=C:\full\path\to\your\copy\of\android\NDK\android-ndk-r7
+SET ANDROID_NDK=C:\full\path\to\your\copy\of\android\NDK\android-ndk-r7b
 SET CMAKE_EXE=C:\full\path\to\cmake\utility\cmake.exe
 SET MAKE_EXE=%ANDROID_NDK%\prebuilt\windows\bin\make.exe
 
@@ -27,4 +27,4 @@ SET BUILD_DIR=build
 ::SET BUILD_DIR=build_x86
 
 :::: other options
-::SET ANDROID_NATIVE_API_LEVEL=8   &:: android-3 is enough for native part of OpenCV but android-8 is required for Java API and samples
+::SET ANDROID_NATIVE_API_LEVEL=8   &:: android-3 is enough for native part of OpenCV but android-8 is required for Java API