[Libreoffice-commits] .: distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf

[Libreoffice Gerrit user]

 distro-configs/LibreOfficeAndroid.conf    |    5 +++--
 distro-configs/LibreOfficeAndroidX86.conf |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 43bf22bb404c4d5339564229eabd32a5c0c9381a
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Nov 29 11:56:06 2012 +0200

    Unify options and their order in the Android distro-configs
    
    Change-Id: Id27ec2d8531df8122d957af19cdd343eb189654d

diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 2509016..10b351c 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -1,18 +1,19 @@
 --host=arm-linux-androideabi
 --disable-cairo-canvas
+--disable-cups
 --disable-ext-presenter-minimizer
 --disable-ext-report-builder
 --disable-gconf
 --disable-gnome-vfs
 --disable-gstreamer-0-10
 --disable-gstreamer
---disable-lockdown
 --disable-liblangtag
+--disable-lockdown
 --disable-mozilla
 --disable-odk
 --disable-opengl
---disable-postgresql-sdbc
 --disable-pdfimport
+--disable-postgresql-sdbc
 --disable-python
 --disable-randr
 --disable-randr-link
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 3893c5b..4414b58 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -24,3 +24,4 @@
 --without-helppack-integration
 --without-myspell-dicts
 --with-build-platform-configure-options=--disable-liblangtag
+--with-java-target-version=1.5