From 95b6907d8e49729b4c47cf637049cc91b45c838e Mon Sep 17 00:00:00 2001 From: Michael Weghorn <m.weghorn@posteo.de> Date: Fri, 23 Apr 2021 09:59:36 +0200 Subject: native-code: Only include pdfimport ctors if PDF import enabled commit 3dba2e4a325fa0fdfbbedb0ffc1fcf678bfcbc94 Date: Thu Mar 25 12:23:43 2021 +0200 Include the pdfimport library constructor in the mobile apps if enabled had unconditionally included the constructors, so e.g. a '--disable-pdfimport' Android build would fail due to missing symbols. Change-Id: Icbf92dd226ef9a3104c37610ee56416c8205b7a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114533 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Jenkins --- solenv/bin/native-code.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index b15e6f27189b..7238055883dd 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -665,11 +665,11 @@ draw_constructor_list = [ # writerperfect/source/draw/wpftdraw.component "com_sun_star_comp_Draw_VisioImportFilter_get_implementation", # sdext/source/pdfimport/pdfimport.component - "sdext_PDFIHybridAdaptor_get_implementation", - "sdext_PDFIRawAdaptor_Writer_get_implementation", - "sdext_PDFIRawAdaptor_Draw_get_implementation", - "sdext_PDFIRawAdaptor_Impress_get_implementation", - "sdext_PDFDetector_get_implementation", + ("sdext_PDFIHybridAdaptor_get_implementation", "#if HAVE_FEATURE_PDFIMPORT"), + ("sdext_PDFIRawAdaptor_Writer_get_implementation", "#if HAVE_FEATURE_PDFIMPORT"), + ("sdext_PDFIRawAdaptor_Draw_get_implementation", "#if HAVE_FEATURE_PDFIMPORT"), + ("sdext_PDFIRawAdaptor_Impress_get_implementation", "#if HAVE_FEATURE_PDFIMPORT"), + ("sdext_PDFDetector_get_implementation", "#if HAVE_FEATURE_PDFIMPORT"), ] writer_factory_list = [ -- cgit