summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/experimental/DocumentLoader/AndroidManifest.xml4
-rw-r--r--android/experimental/DocumentLoader/project.properties2
-rw-r--r--android/experimental/desktop/AndroidManifest.xml4
-rw-r--r--android/experimental/desktop/project.properties2
-rw-r--r--configure.ac6
5 files changed, 9 insertions, 9 deletions
diff --git a/android/experimental/DocumentLoader/AndroidManifest.xml b/android/experimental/DocumentLoader/AndroidManifest.xml
index 65f223b32dad..97815343fc79 100644
--- a/android/experimental/DocumentLoader/AndroidManifest.xml
+++ b/android/experimental/DocumentLoader/AndroidManifest.xml
@@ -4,8 +4,8 @@
android:installLocation="preferExternal"
android:versionCode="1"
android:versionName="1.0">
- <uses-sdk android:minSdkVersion="9"
- android:targetSdkVersion="14"/>
+ <uses-sdk android:minSdkVersion="15"
+ android:targetSdkVersion="15"/>
<application android:label="LO Experimental DocumentLoader"
android:debuggable="true"
android:largeHeap="true"
diff --git a/android/experimental/DocumentLoader/project.properties b/android/experimental/DocumentLoader/project.properties
index 06b2d880c3d4..772d3c57623c 100644
--- a/android/experimental/DocumentLoader/project.properties
+++ b/android/experimental/DocumentLoader/project.properties
@@ -8,7 +8,7 @@
# project structure.
# Project target.
-target=android-14
+target=android-15
# Use the Bootstrap class
android.library.reference.1=../../Bootstrap
diff --git a/android/experimental/desktop/AndroidManifest.xml b/android/experimental/desktop/AndroidManifest.xml
index 9e3b4ac2b05f..d685e17fdb68 100644
--- a/android/experimental/desktop/AndroidManifest.xml
+++ b/android/experimental/desktop/AndroidManifest.xml
@@ -3,8 +3,8 @@
package="org.libreoffice.experimental.desktop"
android:versionCode="1"
android:versionName="1.0">
- <uses-sdk android:minSdkVersion="9"
- android:targetSdkVersion="14"/>
+ <uses-sdk android:minSdkVersion="15"
+ android:targetSdkVersion="15"/>
<application android:label="LibreOffice Desktop"
android:debuggable="true"
android:largeHeap="true"
diff --git a/android/experimental/desktop/project.properties b/android/experimental/desktop/project.properties
index cffbf1ffe426..56b38d24b766 100644
--- a/android/experimental/desktop/project.properties
+++ b/android/experimental/desktop/project.properties
@@ -8,6 +8,6 @@
# project structure.
# Project target.
-target=android-14
+target=android-15
android.library.reference.1=../../Bootstrap
diff --git a/configure.ac b/configure.ac
index 3676db5d0364..6742046b54d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,7 +328,7 @@ if test -n "$with_android_ndk"; then
android_gnu_prefix=i686-linux-android
fi
- test -z "$SYSBASE" && export SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$android_cpu
+ test -z "$SYSBASE" && export SYSBASE=$ANDROID_NDK_HOME/platforms/android-15/arch-$android_cpu
test -z "$AR" && AR=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-ar
test -z "$NM" && NM=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-nm
test -z "$OBJDUMP" && OBJDUMP=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-objdump
@@ -355,7 +355,7 @@ if test -n "$with_android_ndk"; then
fi
ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections"
ANDROIDCFLAGS="$ANDROIDCFLAGS -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI"
- ANDROIDCFLAGS="$ANDROIDCFLAGS --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-$android_cpu"
+ ANDROIDCFLAGS="$ANDROIDCFLAGS --sysroot $ANDROID_NDK_HOME/platforms/android-15/arch-$android_cpu"
ANDROIDCFLAGS="$ANDROIDCFLAGS -Wl,--fix-cortex-a8"
if test -n "$ANDROID_USING_CLANG"; then
@@ -678,7 +678,7 @@ linux-android*)
fi
# Verify that the NDK and SDK options are proper
- if test ! -f "$ANDROID_NDK_HOME/platforms/android-9/arch-arm/usr/lib/libc.a"; then
+ if test ! -f "$ANDROID_NDK_HOME/platforms/android-15/arch-arm/usr/lib/libc.a"; then
AC_MSG_ERROR([the --with-android-ndk option does not point to an Android NDK])
fi