From 91a8353ac59df29fa0d30b50122b506e3e79b12d Mon Sep 17 00:00:00 2001
From: Martin Vajnar <martin.vajnar@gmail.com>
Date: Wed, 3 Jun 2015 15:56:54 +0200
Subject: [PATCH] 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.
---
 orte/contrib/Robot_Demo/AndroidManifest.xml    | 4 ++--
 orte/contrib/Robot_Demo/project.properties     | 2 +-
 orte/contrib/shape_android/AndroidManifest.xml | 4 ++--
 orte/contrib/shape_android/project.properties  | 2 +-
 orte/libaorte/AndroidManifest.xml              | 4 ++--
 orte/libaorte/project.properties               | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/orte/contrib/Robot_Demo/AndroidManifest.xml b/orte/contrib/Robot_Demo/AndroidManifest.xml
index c4f4259..7707948 100644
--- 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 f5a9ea3..2e6404d 100644
--- 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 95c100a..3c49091 100644
--- 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 3690b99..2e6404d 100644
--- 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 a77b1af..8ca533c 100644
--- 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 36f1594..362a0a3 100644
--- 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
-- 
2.39.2