Kaydet (Commit) c2756737 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Require Android API level 15, which is from December 2011

Note that this doesn't really mean a lot for the NDK.

Change-Id: I4061cb856055ae126aadf56afc462182a875e65f
üst 0b5558a6
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
android:installLocation="preferExternal" android:installLocation="preferExternal"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<uses-sdk android:minSdkVersion="9" <uses-sdk android:minSdkVersion="15"
android:targetSdkVersion="14"/> android:targetSdkVersion="15"/>
<application android:label="LO Experimental DocumentLoader" <application android:label="LO Experimental DocumentLoader"
android:debuggable="true" android:debuggable="true"
android:largeHeap="true" android:largeHeap="true"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-14 target=android-15
# Use the Bootstrap class # Use the Bootstrap class
android.library.reference.1=../../Bootstrap android.library.reference.1=../../Bootstrap
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
package="org.libreoffice.experimental.desktop" package="org.libreoffice.experimental.desktop"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<uses-sdk android:minSdkVersion="9" <uses-sdk android:minSdkVersion="15"
android:targetSdkVersion="14"/> android:targetSdkVersion="15"/>
<application android:label="LibreOffice Desktop" <application android:label="LibreOffice Desktop"
android:debuggable="true" android:debuggable="true"
android:largeHeap="true" android:largeHeap="true"
......
...@@ -8,6 +8,6 @@ ...@@ -8,6 +8,6 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-14 target=android-15
android.library.reference.1=../../Bootstrap android.library.reference.1=../../Bootstrap
...@@ -328,7 +328,7 @@ if test -n "$with_android_ndk"; then ...@@ -328,7 +328,7 @@ if test -n "$with_android_ndk"; then
android_gnu_prefix=i686-linux-android android_gnu_prefix=i686-linux-android
fi 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 "$AR" && AR=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-ar
test -z "$NM" && NM=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-nm test -z "$NM" && NM=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-nm
test -z "$OBJDUMP" && OBJDUMP=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-objdump test -z "$OBJDUMP" && OBJDUMP=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-objdump
...@@ -355,7 +355,7 @@ if test -n "$with_android_ndk"; then ...@@ -355,7 +355,7 @@ if test -n "$with_android_ndk"; then
fi fi
ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections" 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 -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" ANDROIDCFLAGS="$ANDROIDCFLAGS -Wl,--fix-cortex-a8"
if test -n "$ANDROID_USING_CLANG"; then if test -n "$ANDROID_USING_CLANG"; then
...@@ -678,7 +678,7 @@ linux-android*) ...@@ -678,7 +678,7 @@ linux-android*)
fi fi
# Verify that the NDK and SDK options are proper # 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]) AC_MSG_ERROR([the --with-android-ndk option does not point to an Android NDK])
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment