[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/Bootstrap android/experimental

[Jack Leigh]

 android/Bootstrap/Makefile.shared                      |    2 +-
 android/Bootstrap/project.properties                   |    2 +-
 android/experimental/DocumentLoader/project.properties |    2 +-
 android/experimental/desktop/project.properties        |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b450d77a30df80861a56f81801f508df0945c543
Author: Jack Leigh <jack.leigh at collabora.com>
Date:   Wed Mar 18 17:45:19 2015 +0000

    android: Bump to android-21
    
    Change-Id: Ifbe9a316795fc0519119aa9420152118f3926653
    Reviewed-on: https://gerrit.libreoffice.org/14946
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 5020773..c85e321 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -62,7 +62,7 @@ properties:
 	echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties
 	echo "# File needed by ndk-gdb" >jni/Application.mk
 	echo "APP_ABI := $(ANDROID_APP_ABI)" > jni/Application.mk
-	echo "APP_PLATFORM := android-15" >> jni/Application.mk
+	echo "APP_PLATFORM := android-21" >> jni/Application.mk
 
 install:
 	unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug install
diff --git a/android/Bootstrap/project.properties b/android/Bootstrap/project.properties
index f28bc83..ca81324 100644
--- a/android/Bootstrap/project.properties
+++ b/android/Bootstrap/project.properties
@@ -9,4 +9,4 @@
 
 android.library=true
 # Project target.
-target=android-15
+target=android-21
diff --git a/android/experimental/DocumentLoader/project.properties b/android/experimental/DocumentLoader/project.properties
index 772d3c5..3b68618 100644
--- a/android/experimental/DocumentLoader/project.properties
+++ b/android/experimental/DocumentLoader/project.properties
@@ -8,7 +8,7 @@
 # project structure.
 
 # Project target.
-target=android-15
+target=android-21
 
 # Use the Bootstrap class
 android.library.reference.1=../../Bootstrap
diff --git a/android/experimental/desktop/project.properties b/android/experimental/desktop/project.properties
index 56b38d2..e25a76a 100644
--- a/android/experimental/desktop/project.properties
+++ b/android/experimental/desktop/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-15
+target=android-21
 
 android.library.reference.1=../../Bootstrap