[Libreoffice-commits] online.git: android/lib configure.ac

[Henry Castro (via logerrit)]

 android/lib/src/main/cpp/CMakeLists.txt.in |    5 +++++
 configure.ac                               |   28 +++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 2eec63af299e2169d87f0563c6eb8637ac4154d4
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Jun 5 10:32:20 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu Jun 11 20:11:44 2020 +0200

    android: add "x86_64" ABI build variant
    
    Change-Id: I19281af5432ae5a02f26f33464ced722759a4c67
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95609
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in b/android/lib/src/main/cpp/CMakeLists.txt.in
index 7715dbbdc..36b63132a 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -1,3 +1,4 @@
+
 cmake_minimum_required(VERSION 3.4.1)
 
 add_library(androidapp SHARED
@@ -34,6 +35,10 @@ elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
     set(LOBUILDDIR_ABI @LOBUILDDIR_ARM64_V8A@)
     set(POCOINCLUDE_ABI @POCOINCLUDE_ARM64_V8A@)
     set(POCOLIB_ABI @POCOLIB_ARM64_V8A@)
+elseif(${ANDROID_ABI} STREQUAL "x86_64")
+    set(LOBUILDDIR_ABI @LOBUILDDIR@)
+    set(POCOINCLUDE_ABI @POCOINCLUDE@)
+    set(POCOLIB_ABI @POCOLIB@)
 else()
     MESSAGE(FATAL_ERROR "Cannot build for ABI ${ANDROID_ABI}, please add support for that.")
 endif()
diff --git a/configure.ac b/configure.ac
index 3b2edb7c1..8d9cf761a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,7 +356,9 @@ fi
 # to the Mac.
 # Android: We need these to setup the CMakeLists.txt properly.
 LOBUILDDIR=
-ANDROID_ABI="armeabi-v7a"
+if test -z "$ANDROID_ABI"; then
+  ANDROID_ABI="armeabi-v7a"
+fi
 LOBUILDDIR_ARM64_V8A=
 POCOINCLUDE=
 POCOINCLUDE_ARM64_V8A=
@@ -379,6 +381,13 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_a
        fi
 
        # Sanity check, just a random object file in the LibreOffice build tree - 64bit
+       if test "$ANDROID_ABI" = "x86_64" ; then
+           if test -f "$LOBUILDDIR/workdir/LinkTarget/StaticLibrary/liblibpng.a" ; then
+               AC_MSG_RESULT([$LOBUILDDIR])
+           else
+               AC_MSG_ERROR([This is not a LibreOffice 64bit core build directory: $LOBUILDDIR])
+           fi
+       else
        if test "$ANDROID_ABI" != "armeabi-v7a" ; then
            if test -f "$LOBUILDDIR_ARM64_V8A/workdir/LinkTarget/StaticLibrary/liblibpng.a" ; then
                AC_MSG_RESULT([$LOBUILDDIR_ARM64_V8A])
@@ -386,6 +395,7 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_a
                AC_MSG_ERROR([This is not a LibreOffice 64bit core build directory: $LOBUILDDIR_ARM64_V8A])
            fi
        fi
+       fi
    fi
 
    # Get the git hash of the core build
@@ -411,6 +421,13 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_a
        fi
 
        # Sanity check - 64bit
+       if test "$ANDROID_ABI" = "x86_64" ; then
+           if test -f "$POCOINCLUDE/Poco/Poco.h"; then
+               AC_MSG_RESULT([$POCOINCLUDE])
+           else
+               AC_MSG_ERROR([This is not a Poco 64bit include directory: $POCOINCLUDE])
+           fi
+       else
        if test "$ANDROID_ABI" != "armeabi-v7a" ; then
            if test -f "$POCOINCLUDE_ARM64_V8A/Poco/Poco.h"; then
                AC_MSG_RESULT([$POCOINCLUDE_ARM64_V8A])
@@ -418,6 +435,7 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_a
                AC_MSG_ERROR([This is not a Poco 64bit include directory: $POCOINCLUDE_ARM64_V8A])
            fi
        fi
+       fi
    fi
 
    # Sanity check
@@ -440,6 +458,13 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_a
        fi
 
        # Sanity check - 64bit
+       if test "$ANDROID_ABI" = "x86_64" ; then
+           if test -f "$POCOLIB/libPocoFoundation.a"; then
+               AC_MSG_RESULT([$POCOLIB])
+           else
+               AC_MSG_ERROR([This is not a Poco 64bit lib directory: $POCOLIB])
+           fi
+       else
        if test "$ANDROID_ABI" != "armeabi-v7a" ; then
            if test -f "$POCOLIB_ARM64_V8A/libPocoFoundation.a"; then
                AC_MSG_RESULT([$POCOLIB_ARM64_V8A])
@@ -447,6 +472,7 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_a
                AC_MSG_ERROR([This is not a Poco 64bit lib directory: $POCOLIB_ARM64_V8A])
            fi
        fi
+       fi
    fi
 
    # Sanity check