diff options
author | merttumer <mert.tumer@collabora.com> | 2021-05-11 06:36:31 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2021-05-12 10:51:53 +0200 |
commit | 78c54afdbe9664e3e84e8b213961500419c1c0b5 (patch) | |
tree | 232207b590c0652918a7ed8ca5f3f676cb114977 | |
parent | bda6085ad3f7691cf38bef560d039e11899998c2 (diff) |
Enable PdfIum for android build
Change-Id: I58d09db362f0de991eab3920683530e1ec43e2bc
Signed-off-by: merttumer <mert.tumer@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115373
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | distro-configs/CPAndroidBranding.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeAndroid.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeAndroidAarch64.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeAndroidX86.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeAndroidX86_64.conf | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 39c50e3260b8..a31a0b22f65a 100644 --- a/configure.ac +++ b/configure.ac @@ -10984,7 +10984,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 |