summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorJack Leigh <jack.leigh@collabora.com>2015-03-18 17:45:19 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-03-30 09:23:46 +0200
commite41e571072a105b9871d7f1014775bba0b2587c7 (patch)
tree43744e3c7b759f8e9f717822af3348b26da5def9 /android
parentf8a0d0e62acee5e1ef964c133a15ecdc00f6b4b3 (diff)
android: Bump to android-21
Change-Id: Ifbe9a316795fc0519119aa9420152118f3926653 Reviewed-on: https://gerrit.libreoffice.org/14946 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'android')
-rw-r--r--android/Bootstrap/Makefile.shared2
-rw-r--r--android/Bootstrap/project.properties2
-rw-r--r--android/experimental/DocumentLoader/project.properties2
-rw-r--r--android/experimental/desktop/project.properties2
4 files changed, 4 insertions, 4 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 93298e915002..4167ff7eec9c 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 f28bc833e15e..ca8132402efd 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 772d3c57623c..3b686189734d 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 56b38d24b766..e25a76a466c3 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