framework/Library_fwk.mk | 7 ++++++-
solenv/bin/native-code.py | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 55404a55984c5a3d34dbb8693fd445a8ce2bac30
Author: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
AuthorDate: Wed May 19 11:24:24 2021 +0200
Commit: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
CommitDate: Wed May 19 11:24:24 2021 +0200
Wasm oprtional autorecovery remove additions
Change-Id: If06478b4d9db2aba6defdb8f5c76bf13954ee22d
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 2d4fdda1c1ef..1f2f9c1aaff2 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -61,6 +61,12 @@ $(eval $(call gb_Library_use_libraries,fwk,\
vcl \
))
+ifneq ($(ENABLE_WASM_STRIP_RECOVERYUI),TRUE)
+$(eval $(call gb_Library_add_exception_objects,fwk,\
+ framework/source/services/autorecovery \
+))
+endif
+
$(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/accelerators/acceleratorcache \
framework/source/accelerators/acceleratorconfiguration \
@@ -150,7 +156,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/recording/dispatchrecorder \
framework/source/recording/dispatchrecordersupplier \
framework/source/services/ContextChangeEventMultiplexer \
- framework/source/services/autorecovery \
framework/source/services/desktop \
framework/source/services/dispatchhelper \
framework/source/services/frame \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 47354e4361cb..a9bdfab0781e 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -184,7 +184,7 @@ core_constructor_list = [
("com_sun_star_form_ORadioButtonModel_get_implementation", "#if
HAVE_FEATURE_DBCONNECTIVITY"),
("com_sun_star_form_XForms_get_implementation", "#if
HAVE_FEATURE_DBCONNECTIVITY"),
# framework/util/fwk.component
- "com_sun_star_comp_framework_AutoRecovery_get_implementation",
+ ("com_sun_star_comp_framework_AutoRecovery_get_implementation","#ifndef
ENABLE_WASM_STRIP_RECOVERYUI"),
"com_sun_star_comp_framework_Desktop_get_implementation",
"com_sun_star_comp_framework_DocumentAcceleratorConfiguration_get_implementation",
"com_sun_star_comp_framework_Frame_get_implementation",
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
