android/experimental/DocumentLoader/AndroidManifest.xml | 4 ++--
android/experimental/DocumentLoader/project.properties | 2 +-
android/experimental/desktop/AndroidManifest.xml | 4 ++--
android/experimental/desktop/project.properties | 2 +-
configure.ac | 6 +++---
sal/osl/unx/nlsupport.c | 3 ---
6 files changed, 9 insertions(+), 12 deletions(-)
New commits:
commit ad2d1082b1e6eb446798e363ccc1e71461bf1748
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Mar 5 15:04:25 2014 +0200
Bin unused global variable
Change-Id: I9bd4ea90638df91122b96f1fb86043c2d770417d
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index f504b9e..ac5ef18 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -838,9 +838,6 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale
* pLocale )
#if defined(MACOSX) || defined(IOS)
#include "system.h"
-/* OS X locale discovery function */
-int (*pGetOSXLocale)( char *, sal_uInt32 );
-
/*****************************************************************************
return the current process locale
*****************************************************************************/
commit c2756737e0dafe9c802346a2cf4d459bf59acd9d
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Mar 5 13:49:04 2014 +0200
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
diff --git a/android/experimental/DocumentLoader/AndroidManifest.xml
b/android/experimental/DocumentLoader/AndroidManifest.xml
index 65f223b..9781534 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 06b2d88..772d3c5 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 9e3b4ac..d685e17 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 cffbf1f..56b38d2 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 3676db5..6742046 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
