configure.ac | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
New commits: commit 8da992df355cab1732d08419f6bf4585ff005120 Author: Jan Holesovsky <[email protected]> AuthorDate: Thu Jul 2 09:28:31 2020 +0200 Commit: Jan Holesovsky <[email protected]> CommitDate: Thu Jul 2 12:04:44 2020 +0200 android: Default to building just the simple case: armeabi-v7a... ... unless more builddirs are provided in --with-lo-builddir, separated by colons. Change-Id: I49946cd932ec22804ecb51aba86f3dae2aba05f5 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97672 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <[email protected]> diff --git a/configure.ac b/configure.ac index ff78941ef..2fd403c52 100644 --- a/configure.ac +++ b/configure.ac @@ -368,7 +368,7 @@ fi # to the Mac. # Android: We need these to setup the CMakeLists.txt properly. LOBUILDDIR= -ANDROID_ABI= +ANDROID_ABI="armeabi-v7a" LOBUILDDIR_ARM64_V8A= LOBUILDDIR_X86= LOBUILDDIR_X86_64= @@ -385,10 +385,12 @@ CORE_VERSION_HASH="" if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_androidapp" = "yes" \); then if test "$enable_androidapp" = "yes" ; then AC_MSG_CHECKING([for Android ABI to build for]) - if test -z "$with_android_abi" ; then - ANDROID_ABI="armeabi-v7a arm64-v8a x86 x86_64" - else + if test -n "$with_android_abi" ; then ANDROID_ABI=`echo $with_android_abi | sed 's/:/ /g'` + else + if echo "$with_lo_builddir" | grep -qs ':' ; then + ANDROID_ABI="armeabi-v7a arm64-v8a x86 x86_64" + fi fi AC_MSG_RESULT([$ANDROID_ABI]) fi _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
