From cfd634ca3e43bd9144dca74c88c828f8d2c96b4d Mon Sep 17 00:00:00 2001
From: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue, 20 Nov 2012 18:27:03 +0400
Subject: [PATCH] Improving compatibility with the latest Android SDK (r21) and
 NDK (r8c).

- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
---
 .../java/android_lib/.settings/org.eclipse.jdt.core.prefs | 5 -----
 .../android_test/.settings/org.eclipse.jdt.core.prefs     | 7 +++----
 samples/android/15-puzzle/.project                        | 2 +-
 .../15-puzzle/.settings/org.eclipse.jdt.core.prefs        | 6 +++---
 .../.settings/org.eclipse.jdt.core.prefs                  | 7 +++----
 samples/android/face-detection/.cproject                  | 8 ++++----
 .../face-detection/.settings/org.eclipse.jdt.core.prefs   | 7 +++----
 samples/android/face-detection/jni/Application.mk         | 1 +
 .../.settings/org.eclipse.jdt.core.prefs                  | 7 +++----
 .../.settings/org.eclipse.jdt.core.prefs                  | 7 +++----
 .../.settings/org.eclipse.jdt.core.prefs                  | 7 +++----
 .../.settings/org.eclipse.jdt.core.prefs                  | 7 +++----
 samples/android/tutorial-3-native/.cproject               | 8 ++++----
 .../.settings/org.eclipse.jdt.core.prefs                  | 7 +++----
 samples/android/tutorial-3-native/jni/Application.mk      | 1 +
 samples/android/tutorial-4-mixed/.cproject                | 8 ++++----
 .../tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs | 7 +++----
 samples/android/tutorial-4-mixed/jni/Application.mk       | 1 +
 18 files changed, 46 insertions(+), 57 deletions(-)
 delete mode 100644 modules/java/android_lib/.settings/org.eclipse.jdt.core.prefs

diff --git a/modules/java/android_lib/.settings/org.eclipse.jdt.core.prefs b/modules/java/android_lib/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 53e0495157..0000000000
--- a/modules/java/android_lib/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Jun 29 04:36:40 MSD 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/modules/java/android_test/.settings/org.eclipse.jdt.core.prefs b/modules/java/android_test/.settings/org.eclipse.jdt.core.prefs
index 53e0495157..b080d2ddc8 100644
--- a/modules/java/android_test/.settings/org.eclipse.jdt.core.prefs
+++ b/modules/java/android_test/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,4 @@
-#Wed Jun 29 04:36:40 MSD 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/android/15-puzzle/.project b/samples/android/15-puzzle/.project
index d9387703f4..e7ad660402 100644
--- a/samples/android/15-puzzle/.project
+++ b/samples/android/15-puzzle/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>15-puzzle</name>
+	<name>OpenCV Sample - 15 puzzle</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs b/samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs
index f77b31c2d2..b080d2ddc8 100644
--- a/samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs
+++ b/samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/android/color-blob-detection/.settings/org.eclipse.jdt.core.prefs b/samples/android/color-blob-detection/.settings/org.eclipse.jdt.core.prefs
index 53e0495157..b080d2ddc8 100644
--- a/samples/android/color-blob-detection/.settings/org.eclipse.jdt.core.prefs
+++ b/samples/android/color-blob-detection/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,4 @@
-#Wed Jun 29 04:36:40 MSD 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/android/face-detection/.cproject b/samples/android/face-detection/.cproject
index 4b8f95d190..f57ae9006c 100644
--- a/samples/android/face-detection/.cproject
+++ b/samples/android/face-detection/.cproject
@@ -28,8 +28,8 @@
 							<tool id="org.eclipse.cdt.build.core.settings.holder.303359177" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.373249505" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/platforms/android-9/arch-arm/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/../../sdk/native/jni/include&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1424359063" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
@@ -40,8 +40,8 @@
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1156172258" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.149918263" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/platforms/android-9/arch-arm/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/../../sdk/native/jni/include&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.719752707" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
diff --git a/samples/android/face-detection/.settings/org.eclipse.jdt.core.prefs b/samples/android/face-detection/.settings/org.eclipse.jdt.core.prefs
index 53e0495157..b080d2ddc8 100644
--- a/samples/android/face-detection/.settings/org.eclipse.jdt.core.prefs
+++ b/samples/android/face-detection/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,4 @@
-#Wed Jun 29 04:36:40 MSD 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/android/face-detection/jni/Application.mk b/samples/android/face-detection/jni/Application.mk
index c7de9c761b..4fffcb2838 100644
--- a/samples/android/face-detection/jni/Application.mk
+++ b/samples/android/face-detection/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -fexceptions
 APP_ABI := armeabi-v7a
+APP_PLATFORM := android-8
diff --git a/samples/android/image-manipulations/.settings/org.eclipse.jdt.core.prefs b/samples/android/image-manipulations/.settings/org.eclipse.jdt.core.prefs
index 53e0495157..b080d2ddc8 100644
--- a/samples/android/image-manipulations/.settings/org.eclipse.jdt.core.prefs
+++ b/samples/android/image-manipulations/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,4 @@
-#Wed Jun 29 04:36:40 MSD 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/android/tutorial-0-androidcamera/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-0-androidcamera/.settings/org.eclipse.jdt.core.prefs
index 53e0495157..b080d2ddc8 100644
--- a/samples/android/tutorial-0-androidcamera/.settings/org.eclipse.jdt.core.prefs
+++ b/samples/android/tutorial-0-androidcamera/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,4 @@
-#Wed Jun 29 04:36:40 MSD 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs
index 53e0495157..b080d2ddc8 100644
--- a/samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs
+++ b/samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,4 @@
-#Wed Jun 29 04:36:40 MSD 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs
index 53e0495157..b080d2ddc8 100644
--- a/samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs
+++ b/samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,4 @@
-#Wed Jun 29 04:36:40 MSD 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/android/tutorial-3-native/.cproject b/samples/android/tutorial-3-native/.cproject
index b63fd66df7..0ea6ad6495 100644
--- a/samples/android/tutorial-3-native/.cproject
+++ b/samples/android/tutorial-3-native/.cproject
@@ -28,8 +28,8 @@
 							<tool id="org.eclipse.cdt.build.core.settings.holder.982773030" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.332905639" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/platforms/android-9/arch-arm/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/../../sdk/native/jni/include&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1475512260" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
@@ -40,8 +40,8 @@
 							<tool id="org.eclipse.cdt.build.core.settings.holder.472513352" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1490236166" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/platforms/android-9/arch-arm/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/../../sdk/native/jni/include&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.945696849" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
diff --git a/samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs
index 53e0495157..b080d2ddc8 100644
--- a/samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs
+++ b/samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,4 @@
-#Wed Jun 29 04:36:40 MSD 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/android/tutorial-3-native/jni/Application.mk b/samples/android/tutorial-3-native/jni/Application.mk
index c7de9c761b..4fffcb2838 100644
--- a/samples/android/tutorial-3-native/jni/Application.mk
+++ b/samples/android/tutorial-3-native/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -fexceptions
 APP_ABI := armeabi-v7a
+APP_PLATFORM := android-8
diff --git a/samples/android/tutorial-4-mixed/.cproject b/samples/android/tutorial-4-mixed/.cproject
index 80c8c9c6d9..57bf7e5a3c 100644
--- a/samples/android/tutorial-4-mixed/.cproject
+++ b/samples/android/tutorial-4-mixed/.cproject
@@ -31,8 +31,8 @@
 								</option>
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1772035264" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/platforms/android-9/arch-arm/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/../../sdk/native/jni/include&quot;"/>
 								</option>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.159439464" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -43,8 +43,8 @@
 								</option>
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1841493632" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/platforms/android-9/arch-arm/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/../../sdk/native/jni/include&quot;"/>
 								</option>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.608739504" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
diff --git a/samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs
index 53e0495157..b080d2ddc8 100644
--- a/samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs
+++ b/samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,4 @@
-#Wed Jun 29 04:36:40 MSD 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/android/tutorial-4-mixed/jni/Application.mk b/samples/android/tutorial-4-mixed/jni/Application.mk
index c7de9c761b..4fffcb2838 100644
--- a/samples/android/tutorial-4-mixed/jni/Application.mk
+++ b/samples/android/tutorial-4-mixed/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -fexceptions
 APP_ABI := armeabi-v7a
+APP_PLATFORM := android-8