[Libreoffice-commits] core.git: 2 commits - android/experimental configure.ac

[Matúš Kukan]

 android/experimental/desktop/Makefile |    2 +-
 configure.ac                          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 38f23632c854145fe6e4853624864d533912ab21
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 31 13:17:03 2013 +0100

    android: 'core' and 'writer' components should be enough
    
    Change-Id: I97a4989ed29db5f777895fee13940cbd6910068e

diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index a661825..90a8b7a 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -13,7 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
 	$< -j \
-		-g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \
+		-g core -g writer \
 		-s basprov -s dlgprov -s cui -s protocolhandler -s scriptframe -s sb -s spl -s stringresource -s uui -s vbaswobj -s vbaevents \
 		> $@
 
commit 31b2ed3451599438441bbd6ac5f25ea104f9435c
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu Dec 12 13:33:24 2013 +0100

    Print more specific error message.
    
    Change-Id: Idf309ab4ae4f9539327e94dbd8dd465822300c81

diff --git a/configure.ac b/configure.ac
index 12c6ad6..9a764f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,7 +221,7 @@ if test -n "$with_android_ndk"; then
     # Set up a lot of pre-canned defaults
 
     if test ! -f $ANDROID_NDK_HOME/RELEASE.TXT; then
-        AC_MSG_ERROR([Unrecognized Android NDK. Only r8* versions supported.])
+        AC_MSG_ERROR([Unrecognized Android NDK. Missing RELEASE.TXT file in $ANDROID_NDK_HOME.])
     fi
     ANDROID_NDK_VERSION=`cut -f1 -d' ' <$ANDROID_NDK_HOME/RELEASE.TXT`