postprocess/Rdb_services.mk | 4 ++--
solenv/bin/native-code.py | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b95eaa6302731b1245a44d57cc680038383d1ca5
Author: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
AuthorDate: Mon May 10 23:15:43 2021 +0200
Commit: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
CommitDate: Mon May 10 23:15:43 2021 +0200
Additions/corrections to dbaccess wasm removal
Change-Id: I463e4a89b1349ff43439b8d548fff9f90b42acef
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 58878654024e..babd617e867d 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -222,7 +222,7 @@ $(eval $(call gb_Rdb_add_components,services,\
) \
))
-ifneq ($(ENABLE_WASM_STRIP_CANVAS),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_DBACCESS),TRUE)
$(eval $(call gb_Rdb_add_components,services,\
dbaccess/util/dba \
))
@@ -234,7 +234,7 @@ $(eval $(call gb_Rdb_add_components,services,\
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-ifneq ($(ENABLE_WASM_STRIP_CANVAS),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_DBACCESS),TRUE)
$(eval $(call gb_Rdb_add_components,services,\
dbaccess/source/filter/xml/dbaxml \
dbaccess/util/dbu \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 63e6c4dcfd2b..a1ea83bf70e5 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -111,13 +111,13 @@ core_constructor_list = [
# cui/util/cui.component
"com_sun_star_cui_ColorPicker_get_implementation",
# dbaccess/util/dba.component
- "com_sun_star_comp_dba_DataAccessDescriptorFactory",
- "com_sun_star_comp_dba_OCommandDefinition",
- "com_sun_star_comp_dba_OComponentDefinition",
- "com_sun_star_comp_dba_ODatabaseContext_get_implementation",
- "com_sun_star_comp_dba_ODatabaseDocument",
- "com_sun_star_comp_dba_ODatabaseSource",
- "com_sun_star_comp_dba_ORowSet_get_implementation",
+ ("com_sun_star_comp_dba_DataAccessDescriptorFactory", "#ifndef
ENABLE_WASM_STRIP_DBACCESS"),
+ ("com_sun_star_comp_dba_OCommandDefinition", "#ifndef
ENABLE_WASM_STRIP_DBACCESS"),
+ ("com_sun_star_comp_dba_OComponentDefinition", "#ifndef
ENABLE_WASM_STRIP_DBACCESS"),
+ ("com_sun_star_comp_dba_ODatabaseContext_get_implementation", "#ifndef
ENABLE_WASM_STRIP_DBACCESS"),
+ ("com_sun_star_comp_dba_ODatabaseDocument", "#ifndef
ENABLE_WASM_STRIP_DBACCESS"),
+ ("com_sun_star_comp_dba_ODatabaseSource", "#ifndef
ENABLE_WASM_STRIP_DBACCESS"),
+ ("com_sun_star_comp_dba_ORowSet_get_implementation", "#ifndef
ENABLE_WASM_STRIP_DBACCESS"),
# drawinglayer/drawinglayer.component
"drawinglayer_XPrimitive2DRenderer",
# embeddedobj/util/embobj.component
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
