[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac distro-configs/CPAndroidBranding.conf distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86_64.conf distro-configs/LibreOfficeAndroidX86.conf

[merttumer (via logerrit)]

 configure.ac                                  |    2 +-
 distro-configs/CPAndroidBranding.conf         |    1 +
 distro-configs/LibreOfficeAndroid.conf        |    1 +
 distro-configs/LibreOfficeAndroidAarch64.conf |    1 +
 distro-configs/LibreOfficeAndroidX86.conf     |    1 +
 distro-configs/LibreOfficeAndroidX86_64.conf  |    1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b9b5c8cc959fea981feaefd35050b2409e63d94e
Author:     merttumer <mert.tumer at collabora.com>
AuthorDate: Tue May 11 06:36:31 2021 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 12 10:38:05 2021 +0200

    Enable PdfIum for android build
    
    Change-Id: I58d09db362f0de991eab3920683530e1ec43e2bc
    Signed-off-by: merttumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115373
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/configure.ac b/configure.ac
index a120ef24069f..86178a7014e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10993,7 +10993,7 @@ AC_SUBST([ENABLE_DCONF])
 # pdf import?
 AC_MSG_CHECKING([whether to build the PDF import feature])
 ENABLE_PDFIMPORT=
-if test $_os != Android -a \( -z "$enable_pdfimport" -o "$enable_pdfimport" = yes \); then
+if test \( -z "$enable_pdfimport" -o "$enable_pdfimport" = yes \); then
     AC_MSG_RESULT([yes])
     ENABLE_PDFIMPORT=TRUE
     AC_DEFINE(HAVE_FEATURE_PDFIMPORT)
diff --git a/distro-configs/CPAndroidBranding.conf b/distro-configs/CPAndroidBranding.conf
index 7d242f78fd07..3331bd483702 100644
--- a/distro-configs/CPAndroidBranding.conf
+++ b/distro-configs/CPAndroidBranding.conf
@@ -9,4 +9,5 @@
 --disable-scripting-javascript
 --with-lang=de en-US es fr pt-BR zh-CN zh-TW
 --with-myspell-dicts
+--enable-pdfimport
 --enable-release-build
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 3ff76a8d60a9..82bc4afe0029 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -8,3 +8,4 @@
 --without-junit
 --disable-largefile
 --with-theme=colibre
+--disable-poppler
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf
index bfc948c021f7..27ad9d1c788c 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -7,3 +7,4 @@
 --without-helppack-integration
 --without-junit
 --with-theme=colibre
+--disable-poppler
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 8fc92786c5e7..2692d796195b 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -8,3 +8,4 @@
 --without-junit
 --disable-largefile
 --with-theme=colibre
+--disable-poppler
diff --git a/distro-configs/LibreOfficeAndroidX86_64.conf b/distro-configs/LibreOfficeAndroidX86_64.conf
index efbbdbb1e945..afc917d9a3f7 100644
--- a/distro-configs/LibreOfficeAndroidX86_64.conf
+++ b/distro-configs/LibreOfficeAndroidX86_64.conf
@@ -8,3 +8,4 @@
 --without-junit
 --disable-largefile
 --with-theme=colibre
+--disable-poppler