Android: update API levels for building

Build all components against API level 22 (Android 5.1). Decrement
minSdkVersion, because ORTE needs pthread_rwlock_* and these are provided
since API level 9 (Android 2.3).

This is the recommended setting by Google. By saying to target the latest
API, we prevent invoking compatibility behaviors. These behaviors are
sometimes buggy (during testing with 'shape_android' after interacting with
menu items they were duplicated each time I tapped on them).

By saying that minimum API level is 9 we declare, that jORTE does not
require any features of the later APIs and that it runs without any
problems at that level.

I tested 'shape_android' on Android 2.3/4.0/4.1/4.3/4.4/5/5.1.

diff --git a/orte/contrib/Robot_Demo/AndroidManifest.xml b/orte/contrib/Robot_Demo/AndroidManifest.xml
index c4f4259995de3658ba0ede0cf63da7e6e9712376..7707948ba9a3886a09b2b220ef6bc4e20456d15b 100644 (file)
--- a/orte/contrib/Robot_Demo/AndroidManifest.xml
+++ b/orte/contrib/Robot_Demo/AndroidManifest.xml
@@ -5,8 +5,8 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="10"
-        android:targetSdkVersion="15" />
+        android:minSdkVersion="9"
+        android:targetSdkVersion="22" />
     
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

diff --git a/orte/contrib/Robot_Demo/project.properties b/orte/contrib/Robot_Demo/project.properties
index f5a9ea3992c759f2bf6642ca2ebecf99eb280dbc..2e6404d2718db92352f9d15e76856e9fa421b873 100644 (file)
--- a/orte/contrib/Robot_Demo/project.properties
+++ b/orte/contrib/Robot_Demo/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-15
+target=android-22
 android.library.reference.1=../../libaorte

diff --git a/orte/contrib/shape_android/AndroidManifest.xml b/orte/contrib/shape_android/AndroidManifest.xml
index 95c100ae9ddc6b9a981328594c52f7f4a18e246c..3c49091ceced62e0356fef4683570e15486524c7 100644 (file)
--- a/orte/contrib/shape_android/AndroidManifest.xml
+++ b/orte/contrib/shape_android/AndroidManifest.xml
@@ -5,8 +5,8 @@
     android:versionName="1.2" >
 
     <uses-sdk
-        android:minSdkVersion="10"
-        android:targetSdkVersion="21" />
+        android:minSdkVersion="9"
+        android:targetSdkVersion="22" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

diff --git a/orte/contrib/shape_android/project.properties b/orte/contrib/shape_android/project.properties
index 3690b9984a984f2336bbd995e30b824096a5e1ac..2e6404d2718db92352f9d15e76856e9fa421b873 100644 (file)
--- a/orte/contrib/shape_android/project.properties
+++ b/orte/contrib/shape_android/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-21
+target=android-22
 android.library.reference.1=../../libaorte

diff --git a/orte/libaorte/AndroidManifest.xml b/orte/libaorte/AndroidManifest.xml
index a77b1afe966c04c1d14318051296414864643c1d..8ca533c0614f61aeefe17b1864408342e6c80501 100644 (file)
--- a/orte/libaorte/AndroidManifest.xml
+++ b/orte/libaorte/AndroidManifest.xml
@@ -4,8 +4,8 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="10"
-        android:targetSdkVersion="15" />
+        android:minSdkVersion="9"
+        android:targetSdkVersion="22" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
 

diff --git a/orte/libaorte/project.properties b/orte/libaorte/project.properties
index 36f15941e2b3cb1b903fab5bfa381722f79cef55..362a0a3082a0075437e3842426c2418f204cc366 100644 (file)
--- a/orte/libaorte/project.properties
+++ b/orte/libaorte/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-15
+target=android-22
 android.library=true